From 3c06b82c3b21d7bc6f92fee399acd070c8dd4ae7 Mon Sep 17 00:00:00 2001
From: huangx <huangx@chinaweal.com.cn>
Date: Tue, 15 Sep 2020 17:51:31 +0800
Subject: [PATCH] 1

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0657728..e67176d 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,9 @@
 hello world!
 
 屏幕面前的你是最棒的！不要问为什么，因为其他人都是最最棒的！
-<<<<<<< .mine
 
-=======
 
->>>>>>> .theirs
+
 hello 黄晓
 hello 发哥