Fix merge conflict in core/base.js

2016-11-02 22:03:50 +01:00 · 2016-11-02 22:03:50 +01:00 · b297bab5b5
commit b297bab5b5
parent ef36962221
1 changed files with 1 additions and 2 deletions
--- a/openslides/core/static/js/core/base.js
+++ b/openslides/core/static/js/core/base.js
@ -476,13 +476,12 @@ angular.module('OpenSlidesApp.core', [
                    theme_url: '/static/js/openslides-libs.js',
                    skin_url: '/static/tinymce/skins/lightgray/',
                    inline: inlineMode,
-                    statusbar: false,
                    browser_spellcheck: true,
                    image_advtab: true,
                    image_list: images,
                    plugins: [
                      'lists link autolink charmap preview searchreplace code fullscreen',
-                      'paste textcolor colorpicker image imagetools'
+                      'paste textcolor colorpicker image imagetools wordcount'
                    ],
                    menubar: '',
                    toolbar: 'undo redo searchreplace | styleselect | bold italic underline strikethrough ' +