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

-<<<<<<< HEAD
-// $hash: 21077dff9f3a381aae5264038edd67d3
-=======
-// $hash: c7c1f3d9261e2b8bbf291b977dfec921
->>>>>>> dev-life
+// $hash: c7c1f3d9261e2b8bbf291b977dfec921