2 changed files with 0 additions and 5 deletions
--- a/README.md
+++ b/README.md
@ -3,10 +3,6 @@
 # gitProject1
 1.精读小米便签源代码，写泛读报告
 <<<<<<< HEAD
 2.
 =======
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@ -28,4 +24,3 @@ abc
 1.精读小米便签源代码，写泛读报告
 >>>>>>> ec5b092c2fe5adbe24627fc2992503627dc1795b
 >>>>>>> 5f5cff49fcbaa1b5df8823143d84bbfcc52cd49f
 >>>>>>> 63fc6f227a94c2fab6101a51858ced17a7619c89
--- a/doc/小米便签开源代码的泛读报告.docx
+++ b/doc/小米便签开源代码的泛读报告.docx