From b29d40710ef62da144a7ec35054c09db82ccc9c5 Mon Sep 17 00:00:00 2001
From: HJL <1711158949@qq.com>
Date: Sat, 23 Mar 2024 18:56:24 +0800
Subject: [PATCH] branch1

---
 1.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/1.txt b/1.txt
index 7c853af..4ff9d30 100644
--- a/1.txt
+++ b/1.txt
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 111
-branch1
\ No newline at end of file
+branch1
+=======
+111
+>>>>>>> e6f58e78a1f9d84f2d54a392f6c132c137a6a0f4