From 62b04274a04f0c695e78d9b5fc57ff574a8febbf Mon Sep 17 00:00:00 2001
From: p29304815 <snryou@126.com>
Date: Thu, 8 Aug 2024 16:46:55 +0800
Subject: [PATCH] Update README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index facb57d..33a988e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,2 @@
 # GitPractise
-<<<<<<< HEAD
-lisi
-=======
 zhangsan
->>>>>>> 3a35eae6b076aca03c24978ad5c8800579d45e80