From 44791b6665abaa742720eb84062501983015e5de Mon Sep 17 00:00:00 2001 From: nordsoft Date: Sun, 27 Aug 2023 21:14:06 +0400 Subject: [PATCH] Revert "Auxiliary commit to revert individual files from c7390a921e3871102292f589978e9e9010eface9" This reverts commit e749954761facf4a760c6b4ef361f2ebce7b1f01. --- client/battle/BattleWindow.cpp | 2 +- config/widgets/{battleWindow.json => battleWindow2.json} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename config/widgets/{battleWindow.json => battleWindow2.json} (100%) diff --git a/client/battle/BattleWindow.cpp b/client/battle/BattleWindow.cpp index c4469540a..538b60b6c 100644 --- a/client/battle/BattleWindow.cpp +++ b/client/battle/BattleWindow.cpp @@ -51,7 +51,7 @@ BattleWindow::BattleWindow(BattleInterface & owner): REGISTER_BUILDER("battleConsole", &BattleWindow::buildBattleConsole); - const JsonNode config(ResourceID("config/widgets/BattleWindow.json")); + const JsonNode config(ResourceID("config/widgets/BattleWindow2.json")); addShortcut(EShortcut::GLOBAL_OPTIONS, std::bind(&BattleWindow::bOptionsf, this)); addShortcut(EShortcut::BATTLE_SURRENDER, std::bind(&BattleWindow::bSurrenderf, this)); diff --git a/config/widgets/battleWindow.json b/config/widgets/battleWindow2.json similarity index 100% rename from config/widgets/battleWindow.json rename to config/widgets/battleWindow2.json