From 0a7ff13b8d704d5e4be04e557b5373b0637ae5b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B3=B0?= <feng.chen@yoho.cn>
Date: Mon, 2 Jul 2018 17:26:18 +0800
Subject: [PATCH] merge

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 9c4acc4..ebf8aa1 100644
--- a/README.md
+++ b/README.md
@@ -40,9 +40,6 @@ export default {
     }
   }
 }
-<<<<<<< HEAD
-```
-=======
 ```
 ## Result
 ![ABC](http://oxqqtdux0.bkt.clouddn.com/WX20180702-172158.png) 
@@ -56,4 +53,3 @@ export default {
 | show-copy   | display the copy button |
 | show-bigger | display the bigger button      |
 | icon-prefix | Custom Font icon prefix      |
->>>>>>> eb16800904be1193c3eb7b87ff67048f22011a5b