From 3319d3cdf94fd16613aceff3671c40087239ad29 Mon Sep 17 00:00:00 2001
From: Luoyuanyuan <2306543568@qq.com>
Date: Thu, 8 Aug 2024 11:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9branch2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hello.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/hello.txt b/hello.txt
index 87949fa..bd5591c 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,9 +1,4 @@
 hello lyy
 hello222
 
-<<<<<<< HEAD
-branch2修改
-branch2修改
-=======
-branch1修改
->>>>>>> 4fb1465acd7b72ac470ae8307e4fbef0bf88df10
+新增branch2