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

# Conflicts: # README.md
dfv
2 changed files with 6 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1,6 +1,12 @@
 <<<<<<< HEAD
 # gitProject1
+
+1.精读小米便签源代码，写泛读报告
+=======
+<<<<<<< HEAD
+# gitProject1
 abc
 =======
 # gitProject1
 >>>>>>> 9219e5ac71f6be25d7e582668d694b98d6c6b249
+>>>>>>> 56b7401c41e8a93705075c2dec372535147025bf
--- a/doc/小米便签开源代码的泛读报告.docx
+++ b/doc/小米便签开源代码的泛读报告.docx
Author	SHA1	Message	Date
fxk	b6e12336e0	Merge branch 'fxk_branch' of https://bdgit.educoder.net/p2whvruqn/gitProject1 # Conflicts: # README.md	2 years ago
fxk	9aa901b9cc	dfv	2 years ago
p2whvruqn	ec5b092c2f	Merge pull request 'write reading report（chen）' (#3 ) from cjr_branch into master	2 years ago
chenjr	05aa88dc22	修改了readme	2 years ago
chenjr	c76cea05ff	Merge branch 'cjr_branch' of https://bdgit.educoder.net/p2whvruqn/gitProject1 into cjr_branch	2 years ago
chenjr	e11c7cfccf	泛读报告Dtask.remote，model和tool Signed-off-by: chenjr <2798956495@qq.com>	2 years ago
p2whvruqn	9a0d182ee5	Initial commit	2 years ago