From 88fbf5e40066734355d2104d14807745b5608173 Mon Sep 17 00:00:00 2001
From: Thlnking <2927874032@qq.com>
Date: Sun, 20 Jul 2025 09:23:46 +0800
Subject: [PATCH] =?UTF-8?q?doc:=20=E5=88=A0=E9=99=A4=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E4=B8=AD=E5=87=BA=E7=8E=B0=E7=9A=84=20git=20=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E6=A0=87=E5=BF=97=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thlnking <2927874032@qq.com>
---
 README_zh.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README_zh.md b/README_zh.md
index b821074..03b1649 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -305,7 +305,6 @@ jobs:
 - [@yusnake](https://github.com/yusnake)
 - @*飞
 - @董*
-<<<<<<< HEAD
 - @*琢
 - @*成
 - @**磊
@@ -313,7 +312,6 @@ jobs:
 - *汀
 - *涯
 - *:-）
->>>>>>> 2fc79dcf377ade7c4fc8883c94a6779fce830a5a
 
 （如果您的名字被屏蔽，请通过我的主页电子邮件与我联系，以便使用您的 GitHub 用户名进行更新。）