From be8bb3a8ee8178a7c3e63e0f7c6bae286f910190 Mon Sep 17 00:00:00 2001
From: par3ythep <3463848349@qq.com>
Date: Mon, 30 Mar 2026 20:57:17 +0800
Subject: [PATCH] =?UTF-8?q?Update=20Git=E5=AE=9E=E8=B7=B5=E7=AC=94?=
 =?UTF-8?q?=E8=AE=B0.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/Git实践笔记.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Git实践笔记.txt b/doc/Git实践笔记.txt
index 71cdba4..015742e 100644
--- a/doc/Git实践笔记.txt
+++ b/doc/Git实践笔记.txt
@@ -1 +1 @@
-main 分支：修改第一行内容，制造冲突
\ No newline at end of file
+main 分支：修改第一行内容，制造冲突（2）
\ No newline at end of file