fixmerge

data/i18n.json

@@ -155,17 +155,12 @@
     "challonge_player_already_in": "Please do not enter the room you are already in.",
     "replay_hint_part1": "Sending the replay of the duel number ",
     "replay_hint_part2": ".",
-<<<<<<< HEAD
-    "invalid_side_rule": "Illegal cards are contained in your side deck.",
     "arena_wait_hint": "If you opponent does not appear within 25 seconds, you may quit without any penalty.",
     "arena_wait_timeout": "Your opponent did not appear, you may quit without any penalty.",
     "auto_death_part1": "This room is an auto-extra-duel room. The Extra Duel will begin after ",
     "auto_death_part2": " minutes.",
     "athletic_arena_tip": "During an athletic match, a game quit behavior is regarded as a surrender.",
     "windbot_disable_random_room": "By adding the AI, this random game won't get any new player unless they enter the room name:"
-=======
-    "athletic_arena_tip": "During an athletic match, a game quit behavior is regarded as a surrender."
->>>>>>> parent of 6a67ab4... restrict siding for some tournaments
   },
   "es-es": {
     "random_duel_enter_room_waiting": "Tu oponente esta listo, Iniciar!",
@@ -467,17 +462,12 @@
     "challonge_player_already_in": "请不要重复加入比赛房间。",
     "replay_hint_part1": "正在发送第",
     "replay_hint_part2": "局决斗的录像。",
-<<<<<<< HEAD
-    "invalid_side_rule": "副卡组中包含不允许换入副卡组的卡。",
     "arena_wait_hint": "若对手在25秒内不进入游戏，您退房时不会进行扣分。",
     "arena_wait_timeout": "由于对手未能在30秒内进入游戏，此时您退出游戏不会扣分。",
     "auto_death_part1": "本房间为自动加时赛房间。比赛开始",
     "auto_death_part2": "分钟后，将自动进入加时赛。",
     "athletic_arena_tip": "在竞技匹配中，比赛开始前退出游戏也会视为投降。",
     "windbot_disable_random_room": "因为添加了AI，本随机对战房间将只能通过房间名加入："
-=======
-    "athletic_arena_tip": "在竞技匹配中，比赛开始前退出游戏也会视为投降。"
->>>>>>> parent of 6a67ab4... restrict siding for some tournaments
   },
  "ko-kr": {
     "random_duel_enter_room_waiting": "땅콩: 게임을 진행하게 준비 또는 시작을 하십시오.",