From f16ba28a3b6a8fe8d32053690463d5de59cd4e1f Mon Sep 17 00:00:00 2001
From: life <lifephp@gmail.com>
Date: Wed, 24 Sep 2014 22:32:05 +0800
Subject: [PATCH] merge develop

---
 public/tinymce/plugins/paste/plugin.dev.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/tinymce/plugins/paste/plugin.dev.js b/public/tinymce/plugins/paste/plugin.dev.js
index e998621..9606bee 100644
--- 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
\ No newline at end of file