Merge branch 'fuck'

# Conflicts: # README.md
2021-01-18 17:31:12 -08:00 · 2021-01-18 17:31:12 -08:00 · 043285dbbb
commit 043285dbbb
parent d1e5f16192 d9edb9ff36
5 changed files with 11 additions and 8 deletions
--- a/PS文件/蜀/SHU001刘备.png
+++ b/PS文件/蜀/SHU001刘备.png
--- a/PS文件/蜀/SHU001刘备.psd
+++ b/PS文件/蜀/SHU001刘备.psd
--- a/PS文件/魏/WEI001曹操.png
+++ b/PS文件/魏/WEI001曹操.png
--- a/PS文件/魏/WEI001曹操.psd
+++ b/PS文件/魏/WEI001曹操.psd
--- a/README.md
+++ b/README.md
@ -58,6 +58,7 @@ Height 89.92 mm
 祝融:	   "巨象"可以捡南蛮,自带+1.
 荀彧:	   "节命"描述bug.

+<<<<<<< HEAD
 公孙瓒:	    字体间距.使用坐骑牌也能发动.
 庞德"	   "猛进"和公孙瓒做出区分.
 曹操:	   "挥鞭"描述bug
@ -67,6 +68,8 @@ Height 89.92 mm
 顾雍:	   "慎行"有概率摸牌.
 徐盛:	   "破军"附加移牌效果.
 豹变牌:	   "挑衅"描述需要更新,
+=======
+>>>>>>> fuck


 ### 2020/01/10