diff options
Diffstat (limited to 'client/components/main/editor.js')
-rwxr-xr-x | client/components/main/editor.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 39c03aa9..6c5b72b7 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -120,6 +120,10 @@ 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 |