diff --git a/1.txt b/1.txt index 850a74f..027bc0d 100644 --- a/1.txt +++ b/1.txt @@ -4,3 +4,4 @@ branc1 ======= 111 >>>>>>> 018c7cd44cba6d6b00221a17621febf027b46c75 +branch2 \ No newline at end of file