ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2582 from emanuelschuetze/fix-mergeconflict

Browse Source 
Fix merge conflict in core/base.js
This commit is contained in:
Norman Jäckel 2016-11-04 12:11:09 +01:00 committed by GitHub
commit 4c08bca34a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openslides/core/static/js/core/base.js
View File

@ -476,13 +476,12 @@ angular.module('OpenSlidesApp.core', [
theme_url: '/static/js/openslides-libs.js', theme_url: '/static/js/openslides-libs.js',
skin_url: '/static/tinymce/skins/lightgray/', skin_url: '/static/tinymce/skins/lightgray/',
inline: inlineMode, inline: inlineMode,
statusbar: false,
browser_spellcheck: true, browser_spellcheck: true,
image_advtab: true, image_advtab: true,
image_list: images, image_list: images,
plugins: [ plugins: [
'lists link autolink charmap preview searchreplace code fullscreen', 'lists link autolink charmap preview searchreplace code fullscreen',
'paste textcolor colorpicker image imagetools' 'paste textcolor colorpicker image imagetools wordcount'
], ],
menubar: '', menubar: '',
toolbar: 'undo redo searchreplace | styleselect | bold italic underline strikethrough ' + toolbar: 'undo redo searchreplace | styleselect | bold italic underline strikethrough ' +