From 7d4b1dd921cba2257db75fb3ae43f55a04c84984 Mon Sep 17 00:00:00 2001
From: jacky_cai <serenewind0627@gmail.com>
Date: Mon, 18 Jan 2021 17:34:31 -0800
Subject: [PATCH] no message

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

diff --git a/README.md b/README.md
index 610b541..227151a 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,6 @@ Height 89.92 mm
 祝融:	   "巨象"可以捡南蛮,自带+1.
 荀彧:	   "节命"描述bug.
 
-<<<<<<< HEAD
 公孙瓒:	    字体间距.使用坐骑牌也能发动.
 庞德"	   "猛进"和公孙瓒做出区分.
 曹操:	   "挥鞭"描述bug
@@ -68,8 +67,7 @@ Height 89.92 mm
 顾雍:	   "慎行"有概率摸牌.
 徐盛:	   "破军"附加移牌效果.
 豹变牌:	   "挑衅"描述需要更新,
-=======
->>>>>>> fuck
+
 
 
 ### 2020/01/10