From fbeedd04df2877c9a0411b2c0a3b3ccd67f55938 Mon Sep 17 00:00:00 2001
From: chenjr <2798956495@qq.com>
Date: Thu, 20 Apr 2023 20:24:29 +0800
Subject: [PATCH] change readme

---
 README.md | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 722a882..0b554b1 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-# gitProject1
 
-1.精读小米便签源代码，写泛读报告
-<<<<<<< HEAD
-
-2.
-=======
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-# gitProject1
-abc
-=======
-# gitProject1
->>>>>>> 9219e5ac71f6be25d7e582668d694b98d6c6b249
->>>>>>> 56b7401c41e8a93705075c2dec372535147025bf
-=======
-# gitProject1
->>>>>>> 678e0f2fc21bc4a1625205602371ca421396ceee
->>>>>>> 856149d31b3fdb3d65ebb0c2da0a49c2b8417f9e
-=======
-# gitProject1
-=======
-# gitProject1
+# 小米便签
 
 1.精读小米便签源代码，写泛读报告
->>>>>>> ec5b092c2fe5adbe24627fc2992503627dc1795b
->>>>>>> 5f5cff49fcbaa1b5df8823143d84bbfcc52cd49f
->>>>>>> 63fc6f227a94c2fab6101a51858ced17a7619c89