From 27e2ea5b1c71a5b8b881f9132076a1e0d6046ead Mon Sep 17 00:00:00 2001
From: youngyi <snryou@126.com>
Date: Thu, 8 Aug 2024 16:47:15 +0800
Subject: [PATCH] lisi

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

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