From 6e7b86b2a56e99354293964859521e563747f8cb Mon Sep 17 00:00:00 2001
From: fengyuecanzhu <61369261+fengyuecanzhu@users.noreply.github.com>
Date: Wed, 29 Jul 2020 18:25:55 +0800
Subject: [PATCH] Update README.md

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

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