diff --git a/abc.txt b/abc.txt index 387b365..4bbb57f 100644 --- a/abc.txt +++ b/abc.txt @@ -1,4 +1,6 @@ -This is a conflict line +aslkfjsda;fja +asjfkld;safjkas;dfjasd +dsalk;fjlkl;asdjfk a;lsdfk;safjka ajlkfdas;dfjklasjdf akjflasd;fjalsdf;kjl;asd @@ -6,3 +8,5 @@ alkdsj;jas;fjlas;dfjasd;fja; asjklf;asfjkas ajkfl;asdkjfsa al;sfjda;lsfj +aslfjkasd;fja +skdjlafj;asdjfk