Update newfile2.txt

2 years ago · 1faf6c02d2
parent b407382827
commit 1faf6c02d2
1 changed files with 1 additions and 3 deletions
--- a/newfile2.txt
+++ b/newfile2.txt
@ -1,6 +1,4 @@
 new file2
-<<<<<<< HEAD
 uuuuuuuu
-=======
 wwwwwwww
->>>>>>> 53ae6021d868f894eecda7cc3f547533910ccbf8
+