fix(doc):解决

feat(doc):featire分支修改同一文件制造冲突
feat(doc):冲突分支修改git_practice.txt
1 changed files with 1 additions and 2 deletions
--- a/doc/git_practice.txt
+++ b/doc/git_practice.txt
@ -1,2 +1 @@
-Git 练习
-新增PR
+feature分支修改：冲突测试内容
Author	SHA1	Message	Date
ahwuwu	98ada2acf0	fix(doc):解决	1 month ago
ahwuwu	6c7ba0db32	feat(doc):featire分支修改同一文件制造冲突	1 month ago
ahwuwu	ac5e67e338	feat(doc):冲突分支修改git_practice.txt	1 month ago