From 1865b9885e804ebf2d5e46dd85ee20454d8d8d2e Mon Sep 17 00:00:00 2001
From: 1281034228 <1281034228@qq.com>
Date: Tue, 14 Jul 2026 15:23:04 +0800
Subject: [PATCH] patch:modify 1. txt

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

diff --git a/1.txt b/1.txt
index d1d06ad..e98ae8f 100644
--- a/1.txt
+++ b/1.txt
@@ -1 +1,5 @@
-1111
\ No newline at end of file
+<<<<<<< HEAD
+1111
+=======
+patch change
+>>>>>>> patch:modify 1. txt