From b297bab5b50b3c32a46a1682565ed4fb6393acc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Wed, 2 Nov 2016 22:03:50 +0100
Subject: [PATCH] Fix merge conflict in core/base.js

---
 openslides/core/static/js/core/base.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openslides/core/static/js/core/base.js b/openslides/core/static/js/core/base.js
index 5ced66b76..89832e0b9 100644
--- 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 ' +