Merge branch 'fxk_branch' of https://bdgit.educoder.net/p2whvruqn/gitProject1

# Conflicts: # README.md
3 years ago · b6e12336e0
parent 9aa901b9cc 56b7401c41
commit b6e12336e0
1 changed files with 10 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -1,3 +1,12 @@
+<<<<<<< HEAD
 # gitProject1

-1.精读小米便签源代码，写泛读报告
+1.精读小米便签源代码，写泛读报告
+=======
+<<<<<<< HEAD
+# gitProject1
+abc
+=======
+# gitProject1
+>>>>>>> 9219e5ac71f6be25d7e582668d694b98d6c6b249
+>>>>>>> 56b7401c41e8a93705075c2dec372535147025bf