From a13e25c2a545f9792f4d34bfdfb00912a9b47286 Mon Sep 17 00:00:00 2001
From: HeQiJin <614823270@qq.com>
Date: Sun, 24 Mar 2024 18:25:26 +0800
Subject: [PATCH] branch1

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

diff --git a/1.txt b/1.txt
index 9ed5048..18f7864 100644
--- a/1.txt
+++ b/1.txt
@@ -1,8 +1,4 @@
 42120412
 branch1
-<<<<<<< HEAD
 branch2
-=======
-branch2
->>>>>>> branch2
-pull
+