Update README.md

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