Skip to content

G
gitlab-ce
Commit 5e9c501d authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

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

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 9ba243a5
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
app/assets/javascripts/render_gfm.js
View file @ 5e9c501d
import renderMath from './render_math'; import renderMath from './render_math';
<<<<<<< HEAD
import renderMermaid from './render_mermaid'; import renderMermaid from './render_mermaid';
=======
>>>>>>> origin/master
// Render Gitlab flavoured Markdown // Render Gitlab flavoured Markdown
// //
...@@ -11,10 +8,7 @@ import renderMermaid from './render_mermaid'; ...@@ -11,10 +8,7 @@ import renderMermaid from './render_mermaid';
$.fn.renderGFM = function renderGFM() { $.fn.renderGFM = function renderGFM() {
this.find('.js-syntax-highlight').syntaxHighlight(); this.find('.js-syntax-highlight').syntaxHighlight();
renderMath(this.find('.js-render-math')); renderMath(this.find('.js-render-math'));
<<<<<<< HEAD
renderMermaid(this.find('.js-render-mermaid')); renderMermaid(this.find('.js-render-mermaid'));
=======
>>>>>>> origin/master
return this; return this;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7