1 files changed, 0 insertions, 4 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 6c5b72b7..39c03aa9 100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -120,10 +120,6 @@ Template.editor.onRendered(() => {
     autosize($textarea);
     $textarea.escapeableTextComplete(mentions);
   };
-<<<<<<< HEAD
-=======
-  
->>>>>>> ac37e360b69b799c12f03e1c158cfc0367d26e55
   if (Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR !== false) {
     const isSmall = Utils.isMiniScreen();
     const toolbar = isSmall