From 2f9a3c73168095fe495298e375ff05eecf6e49aa Mon Sep 17 00:00:00 2001
From: email <15737449156@163.com>
Date: Tue, 15 Jul 2025 16:35:01 +0800
Subject: [PATCH] 1

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

diff --git a/1.txt b/1.txt
index bfa807e..d1d06ad 100644
--- a/1.txt
+++ b/1.txt
@@ -1,7 +1 @@
-<<<<<<< HEAD
-11
-11
-=======
-1111
->>>>>>> parent of 48fb98a (1)
-111
+1111
\ No newline at end of file