合并lisi请求readme

Merge branch 'main' of https://bdgit.educoder.net/p29304815/GitPractise into lisi_branch
1 changed files with 4 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1,2 +1,6 @@
 # GitPractise
+<<<<<<< HEAD
+lisi
+=======
 zhangsan
+>>>>>>> 3a35eae6b076aca03c24978ad5c8800579d45e80
Author	SHA1	Message	Date
p29304815	243e08a767	合并lisi请求readme 合并lisi请求readme	7 months ago
youngyi	6a4444e98f	Merge branch 'main' of https://bdgit.educoder.net/p29304815/GitPractise into lisi_branch # Conflicts: # README.md	7 months ago
youngyi	b6ad8e593c	lisi	7 months ago