diff --git a/test.txt b/test.txt index 0114ecc..b5ca4b0 100644 --- a/test.txt +++ b/test.txt @@ -11,4 +11,11 @@ z1 z2 13131 d11111 d2 d3 +<<<<<<< HEAD >>>>>>> remotes/origin/developer +======= +d4w +d5 +d6 +d7 +>>>>>>> remotes/origin/main