PR

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