From 76027b981b4e1cdcdc3bddc791ae9f4e135cb3f4 Mon Sep 17 00:00:00 2001
From: email <15737449156@163.com>
Date: Mon, 14 Jul 2025 19:18:35 +0800
Subject: [PATCH] 1

---
 1.txt | 4 ++++
 3.txt | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/1.txt b/1.txt
index 47e3206..a8d577b 100644
--- a/1.txt
+++ b/1.txt
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 11
 11
+=======
+1111
+>>>>>>> parent of 48fb98a (1)
diff --git a/3.txt b/3.txt
index 8d8b5a7..af5274d 100644
--- a/3.txt
+++ b/3.txt
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 33
-33
\ No newline at end of file
+33
+=======
+3333
+>>>>>>> parent of 48fb98a (1)