1 changed files with 1 additions and 1 deletions
--- a/doc/git_practice.txt
+++ b/doc/git_practice.txt
@ -1 +1 @@
-feature分支修改：冲突测试内容
+main分支修改