lisi

9 months ago · 27e2ea5b1c
parent 6a4444e98f
commit 27e2ea5b1c
1 changed files with 0 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -1,6 +1,2 @@
 # GitPractise
-<<<<<<< HEAD
 lisi
-=======
-zhangsan
->>>>>>> 3a35eae6b076aca03c24978ad5c8800579d45e80