From 534818604ff0b72fc3d650e48356ddfe1713729b Mon Sep 17 00:00:00 2001
From: pxcfe32mn <2936645439@qq.com>
Date: Tue, 28 Jul 2020 13:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9hello=5Fhxf.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hello_hxf.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/hello_hxf.txt b/hello_hxf.txt
index 886adfc..950a7e5 100644
--- a/hello_hxf.txt
+++ b/hello_hxf.txt
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
 0987654321
-=======
 1234567890
->>>>>>> 0dce1f40e8136d76e8fb8a97d0c523aea959a8d0