fix conflict

2015-03-31 16:56:26 +08:00
parent 5fae5dd10e
commit f959694b0f
18 changed files with 34 additions and 139 deletions
--- a/public/tinymce/plugins/paste/plugin.dev.js
+++ b/public/tinymce/plugins/paste/plugin.dev.js
@ -117,8 +117,4 @@
 	writeScripts();
 })(this);

-<<<<<<< HEAD
-// $hash: 81dccd126cf777c058d698320fb736ed
-=======
-// $hash: eead586884e827fb28480c335ab9d3fc
->>>>>>> dev-life
+// $hash: eead586884e827fb28480c335ab9d3fc
--- a/public/tinymce/plugins/spellchecker/plugin.min.js
+++ b/public/tinymce/plugins/spellchecker/plugin.min.js