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

# Conflicts: # README.md # 新建文本文档.txt
2 years ago · cd2b91c996
parent c4ebb7bba7 678e0f2fc2
commit cd2b91c996
2 changed files with 6 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -1,3 +1,7 @@
 <<<<<<< HEAD
 # gitProject1
-1.精读小米便签源代码，写泛读报告
+1.精读小米便签源代码，写泛读报告
 =======
 # gitProject1
 >>>>>>> 678e0f2fc21bc4a1625205602371ca421396ceee
--- a/新建文本文档.txt
+++ b/新建文本文档.txt
@ -0,0 +1 @@
 zhiyin