branch1

1 changed files with 6 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1 +1,6 @@
-111
+<<<<<<< HEAD
+111
+branch1
+=======
+111
+>>>>>>> e6f58e78a1f9d84f2d54a392f6c132c137a6a0f4
Author	SHA1	Message	Date
HJL	b29d40710e	branch1	1 year ago
HJL	1f7f2e60a8	branch1	1 year ago