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冲突	8 months ago
youngyi	f329435ba0	Merge branch 'main' of https://bdgit.educoder.net/p29304815/GitPractise into lisi_branch # Conflicts: # README.md	8 months ago
youngyi	27e2ea5b1c	lisi	8 months ago
p29304815	62b04274a0	Update README.md	8 months ago
p29304815	243e08a767	合并lisi请求readme 合并lisi请求readme	8 months ago
youngyi	6a4444e98f	Merge branch 'main' of https://bdgit.educoder.net/p29304815/GitPractise into lisi_branch # Conflicts: # README.md	8 months ago
p29304815	3a35eae6b0	合并zhangsan请求readme 合并zhangsan请求readme	8 months ago
youngyi	b6ad8e593c	lisi	8 months ago
p29304815	b890a6366b	合并zhangsan的请求合并zhangsan的请求	8 months ago