Resolve conflict in app/assets/javascripts/render_gfm.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/javascripts/render_gfm.js

 import renderMath from './render_math';
-<<<<<<< HEAD
 import renderMermaid from './render_mermaid';
-=======
->>>>>>> origin/master
 
 // Render Gitlab flavoured Markdown
 //
@@ -11,10 +8,7 @@ import renderMermaid from './render_mermaid';
 $.fn.renderGFM = function renderGFM() {
   this.find('.js-syntax-highlight').syntaxHighlight();
   renderMath(this.find('.js-render-math'));
-<<<<<<< HEAD
   renderMermaid(this.find('.js-render-mermaid'));
-=======
->>>>>>> origin/master
   return this;
 };