From 0febd834eaf941ddee3d0d7683be5d723650f33b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=91=E9=B9=8F=20=E9=AB=98?= <gaoyunpeng@xinje.cc>
Date: Mon, 7 Jul 2025 19:14:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'local=5Fsubmit.txt'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 local_submit.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/local_submit.txt b/local_submit.txt
index 9e68635..a2c065f 100644
--- a/local_submit.txt
+++ b/local_submit.txt
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-123
-=======
+
 需要重置
->>>>>>> 88ad302fc503373c17f9922d5b07486a4d6d9ee7
+

From 2662ee02778c50069c35664100b998031942dafc Mon Sep 17 00:00:00 2001
From: "GYP\\54194" <gaoyunpeng@xinje.cc>
Date: Mon, 7 Jul 2025 19:15:58 +0800
Subject: [PATCH 2/2] no message

---
 local_submit.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/local_submit.txt b/local_submit.txt
index 9e68635..a2c065f 100644
--- a/local_submit.txt
+++ b/local_submit.txt
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-123
-=======
+
 需要重置
->>>>>>> 88ad302fc503373c17f9922d5b07486a4d6d9ee7
+