PR

1 year ago · 2004c394b8
parent 12449b5c63
commit 2004c394b8
1 changed files with 3 additions and 6 deletions
--- a/doc/111.txt
+++ b/doc/111.txt
@ -1,7 +1,4 @@
-<<<<<<< HEAD
 111
-=======
-111
-branch
-pull request
->>>>>>> liuyutin_branch
+branch1
+branch2
+pull request