Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
jhyeon1010 committed Mar 16, 2018
2 parents c58d520 + d9b9bf9 commit bddee0d
Show file tree
Hide file tree
Showing 260 changed files with 2,892 additions and 4,182 deletions.
2 changes: 1 addition & 1 deletion assets/ckeditor/adapters/jquery.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions assets/ckeditor/build-config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand All @@ -13,10 +13,10 @@
* (1) http://ckeditor.com/builder
* Visit online builder to build CKEditor from scratch.
*
* (2) http://ckeditor.com/builder/3478591c5e8130b730222948604d62a5
* (2) http://ckeditor.com/builder/a4fa2aa836d4bbaa31b1a93df778acda
* Visit online builder to build CKEditor, starting with the same setup as before.
*
* (3) http://ckeditor.com/builder/download/3478591c5e8130b730222948604d62a5
* (3) http://ckeditor.com/builder/download/a4fa2aa836d4bbaa31b1a93df778acda
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
*
* NOTE:
Expand All @@ -26,7 +26,7 @@

var CKBUILDER_CONFIG = {
skin: 'moono',
preset: 'standard',
preset: 'full',
ignore: [
'.DS_Store',
'.bender',
Expand Down Expand Up @@ -59,6 +59,7 @@ var CKBUILDER_CONFIG = {
'codesnippet' : 1,
'colorbutton' : 1,
'colordialog' : 1,
'divarea' : 1,
'elementspath' : 1,
'enterkey' : 1,
'entities' : 1,
Expand All @@ -84,13 +85,12 @@ var CKBUILDER_CONFIG = {
'showblocks' : 1,
'showborders' : 1,
'sourcearea' : 1,
'specialchar' : 1,
'stylescombo' : 1,
'tab' : 1,
'table' : 1,
'toolbar' : 1,
'undo' : 1,
'wsc' : 1,
'widget' : 1,
'wysiwygarea' : 1
},
languages : {
Expand All @@ -113,6 +113,7 @@ var CKBUILDER_CONFIG = {
'en-gb' : 1,
'eo' : 1,
'es' : 1,
'es-mx' : 1,
'et' : 1,
'eu' : 1,
'fa' : 1,
Expand Down
1,233 changes: 620 additions & 613 deletions assets/ckeditor/ckeditor.js

Large diffs are not rendered by default.

134 changes: 0 additions & 134 deletions assets/ckeditor/content.css

This file was deleted.

Loading

0 comments on commit bddee0d

Please sign in to comment.