1

10 months ago · 63c7729336
parent 62786cfd45 60a2f305e0
commit 63c7729336
2 changed files with 5 additions and 1 deletions
--- a/test.txt
+++ b/test.txt
@ -1 +1,5 @@
+<<<<<<< HEAD
 10086
+=======
+111
+>>>>>>> dev
--- a/text1.2.txt
+++ b/text1.2.txt