diff --git a/newfile2.txt b/newfile2.txt index 1d941b7..0a7f159 100644 --- a/newfile2.txt +++ b/newfile2.txt @@ -1,6 +1,4 @@ new file2 -<<<<<<< HEAD uuuuuuuu -======= wwwwwwww ->>>>>>> 53ae6021d868f894eecda7cc3f547533910ccbf8 +