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/tinymce.dev.js
+++ b/public/tinymce/tinymce.dev.js
@ -210,8 +210,4 @@
 	writeScripts();
 })(this);

-<<<<<<< HEAD
-// $hash: 74b17a21024745d16a29236bf5163be7
-=======
-// $hash: 11a55fa37d4eb591eeccc37e9f5b9d00
->>>>>>> dev-life
+// $hash: 11a55fa37d4eb591eeccc37e9f5b9d00