修改hello_hxf.txt

5 years ago · 534818604f
parent 9561370fa1
commit 534818604f
1 changed files with 0 additions and 3 deletions
--- a/hello_hxf.txt
+++ b/hello_hxf.txt
@ -1,5 +1,2 @@
-<<<<<<< HEAD
 0987654321
-=======
 1234567890
->>>>>>> 0dce1f40e8136d76e8fb8a97d0c523aea959a8d0