fix_str

ea6ceae0 · nanahira · c6d7d016 · ea6ceae0
Commit ea6ceae0 authored Dec 25, 2017 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

strings.conf strings.conf +0 -3

No files found.
--- a/strings.conf
+++ b/strings.conf
@@ -301,12 +301,9 @@
 !system 1276 自动排列连锁顺序
 !system 1277 没有可连锁的卡时延迟回应
 !system 1278 自动选择魔陷卡片位置
-<<<<<<< HEAD
 !system 1279 开启音效
 !system 1280 开启音乐
 !system 1281 按场景切换音乐
-=======
->>>>>>> d269645... add bot mode (#2059)
 !system 1290 忽略对方发言
 !system 1291 忽略观战者发言
 !system 1292 忽略时点