lisi冲突

Merge branch 'main' of https://bdgit.educoder.net/p29304815/GitPractise into lisi_branch
1 changed files with 2 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1,2 +1,4 @@
 # GitPractise
+
+lisi
 zhangsan
Author	SHA1	Message	Date
p29304815	4c8ca08cd7	lisi冲突 lisi冲突	7 months ago
youngyi	f329435ba0	Merge branch 'main' of https://bdgit.educoder.net/p29304815/GitPractise into lisi_branch # Conflicts: # README.md	7 months ago
youngyi	27e2ea5b1c	lisi	7 months ago