合并b1

2 years ago · 4215604bb3
parent d80d7be2e6 ba530242af
commit 4215604bb3
1 changed files with 3 additions and 4 deletions
--- a/1.txt
+++ b/1.txt
@ -1,6 +1,5 @@
 <<<<<<< HEAD
 111
-branc1
+branch1
-=======
+branch2
-111
+pull request
 >>>>>>> 018c7cd44cba6d6b00221a17621febf027b46c75