合并lisi请求readme
@ -1,2 +1,6 @@
# GitPractise
<<<<<<< HEAD
lisi
=======
zhangsan
>>>>>>> 3a35eae6b076aca03c24978ad5c8800579d45e80