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

# Conflicts:
#	doc/小米便签开源代码的泛读报告.docx

README.md

@@ -3,5 +3,15 @@
 
 1.精读小米便签源代码，写泛读报告
 =======
+<<<<<<< HEAD
+<<<<<<< HEAD
+# gitProject1
+abc
+=======
+# gitProject1
+>>>>>>> 9219e5ac71f6be25d7e582668d694b98d6c6b249
+>>>>>>> 56b7401c41e8a93705075c2dec372535147025bf
+=======
 # gitProject1
 >>>>>>> 678e0f2fc21bc4a1625205602371ca421396ceee
+>>>>>>> 856149d31b3fdb3d65ebb0c2da0a49c2b8417f9e