1

3 years ago · 89b9c23c3f
parent 8b307730e5
commit 89b9c23c3f
1 changed files with 9 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 # gitProject1

 1.精读小米便签源代码，写泛读报告
@ -15,3 +16,11 @@ abc
 # gitProject1
 >>>>>>> 678e0f2fc21bc4a1625205602371ca421396ceee
 >>>>>>> 856149d31b3fdb3d65ebb0c2da0a49c2b8417f9e
+=======
+# gitProject1
+=======
+# gitProject1
+
+1.精读小米便签源代码，写泛读报告
+>>>>>>> ec5b092c2fe5adbe24627fc2992503627dc1795b
+>>>>>>> 5f5cff49fcbaa1b5df8823143d84bbfcc52cd49f