From 4fcda094140d83f6fd748adaa7856220744eb5c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=86=B0=E6=B4=8B?=
 <14962284+yu-bingyang2024@user.noreply.gitee.com>
Date: Mon, 30 Sep 2024 18:42:15 +0800
Subject: [PATCH] 1

---
 123.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/123.txt b/123.txt
index 1eb9317..5d75899 100644
--- a/123.txt
+++ b/123.txt
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
+123main
 123
-=======
-123bruch
->>>>>>> yubingyang_branch