fix(doc):解决

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