From 22a00ad732cfd69e173150c78906740160f64493 Mon Sep 17 00:00:00 2001
From: "GYP\\54194" <gaoyunpeng@xinje.cc>
Date: Mon, 7 Jul 2025 19:27:04 +0800
Subject: [PATCH] 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
+