John Doe 4 years ago
parent
commit
c9731a87b5
2 changed files with 10 additions and 2 deletions
  1. 5 1
      1.html
  2. 5 1
      4.txt

+ 5 - 1
1.html

@@ -1 +1,5 @@
-Does she love me?
+<<<<<<< HEAD
+Does she love me?
+=======
+Welcome home <3
+>>>>>>> master

+ 5 - 1
4.txt

@@ -1 +1,5 @@
-5623474
+<<<<<<< HEAD
+5623474
+=======
+fs
+>>>>>>> master