Update newfile2.txt

master
pah5rctm2 2 years ago
parent b407382827
commit 1faf6c02d2

@ -1,6 +1,4 @@
new file2 new file2
<<<<<<< HEAD
uuuuuuuu uuuuuuuu
=======
wwwwwwww wwwwwwww
>>>>>>> 53ae6021d868f894eecda7cc3f547533910ccbf8

Loading…
Cancel
Save