修改实践笔记第一行，制造冲突

2 weeks ago · 89d754e335
parent d8bba326b2
commit 89d754e335
1 changed files with 1 additions and 1 deletions
--- a/doc/Git实践笔记.txt
+++ b/doc/Git实践笔记.txt
@ -1 +1 @@
-远程仓库编辑：测试拉取功能
+郑汐蕾_branch 分支：修改第一行内容，制造冲突