diff --git a/README.md b/README.md
index 8837bcc..5a2399f 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,3 @@
     
     8、支持将书架及设置同步至网络
     
-
-
-
-=======
-# FYReader-marster
->>>>>>> 2c33f0b33a0411efd93a4810de5061a473835ff5