asd

Merge branch 'dev' of https://bdgit.educoder.net/p2whvruqn/gitProject1
# Conflicts: # README.md # doc/小米便签开源代码的泛读报告.docx
2 changed files with 5 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -4,9 +4,14 @@
 1.精读小米便签源代码，写泛读报告
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 # gitProject1
 abc
 =======
 # gitProject1
 >>>>>>> 9219e5ac71f6be25d7e582668d694b98d6c6b249
 >>>>>>> 56b7401c41e8a93705075c2dec372535147025bf
+=======
+# gitProject1
+>>>>>>> 678e0f2fc21bc4a1625205602371ca421396ceee
+>>>>>>> 856149d31b3fdb3d65ebb0c2da0a49c2b8417f9e
--- a/doc/小米便签开源代码的泛读报告.docx
+++ b/doc/小米便签开源代码的泛读报告.docx
Author	SHA1	Message	Date
fxk	e233fc51b0	asd	2 years ago
fxk	021d272896	Merge branch 'dev' of https://bdgit.educoder.net/p2whvruqn/gitProject1 # Conflicts: # README.md # doc/小米便签开源代码的泛读报告.docx	2 years ago
hui	856149d31b	doc	2 years ago
hui	545e85b761	1	2 years ago
hui	0ffd401d0d	1	2 years ago
hui	cd2b91c996	Merge branch 'dev' of https://bdgit.educoder.net/p2whvruqn/gitProject1 into dev # Conflicts: # README.md # 新建文本文档.txt	2 years ago
hui	c4ebb7bba7	Merge branch 'master' of https://bdgit.educoder.net/p2whvruqn/gitProject1 into dev	2 years ago
p2whvruqn	678e0f2fc2	Initial commit	2 years ago
p2whvruqn	700585e7b4	Initial commit	2 years ago
p2whvruqn	f3a1fb2fda	Initial commit	2 years ago
p2whvruqn	45b7962aad	Update README.md	2 years ago