hello_hxf.txt

5 years ago · 74ff2d419d
parent 2252f069dc 0dce1f40e8
commit 74ff2d419d
2 changed files with 5 additions and 0 deletions
--- a/hello_hxf.txt
+++ b/hello_hxf.txt
@ -1 +1,5 @@
+<<<<<<< HEAD
 0987654321
+=======
+1234567890
+>>>>>>> 0dce1f40e8136d76e8fb8a97d0c523aea959a8d0
--- a/hello_sh.txt
+++ b/hello_sh.txt
@ -0,0 +1 @@
+hello shu huan