merge develop

2014-09-24 22:32:05 +08:00
parent 9db1164fe0
commit f16ba28a3b
1 changed files with 1 additions and 5 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: 4128985475d955f4e25ca4be38045cbb
-=======
-// $hash: f3e95e8badf18b4ad870bbb7bb543313
->>>>>>> develop-feature-blog
+// $hash: f3e95e8badf18b4ad870bbb7bb543313