From 9e49c9c8dfd2960d176678dc0c785795015fb6e4 Mon Sep 17 00:00:00 2001 From: Josh Bodner Date: Sun, 3 Apr 2022 16:41:46 -0700 Subject: [PATCH] This has to be the last time I fix this rebase conflict --- libultraship/libultraship/GameSettings.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/libultraship/libultraship/GameSettings.cpp b/libultraship/libultraship/GameSettings.cpp index 23dbf0afd..678555c7d 100644 --- a/libultraship/libultraship/GameSettings.cpp +++ b/libultraship/libultraship/GameSettings.cpp @@ -159,10 +159,7 @@ namespace Game { Conf[ControllerSection]["input_scale"] = std::to_string(Settings.controller.input_scale); Conf[ControllerSection]["input_enabled"] = std::to_string(Settings.controller.input_enabled); Conf[ControllerSection]["dpad_pause_name"] = std::to_string(Settings.controller.dpad_pause_name); -<<<<<<< HEAD Conf[ControllerSection]["dpad_ocarina_text"] = std::to_string(Settings.controller.dpad_ocarina_text); -======= ->>>>>>> c9753a0 (Fixing rebase conflict again) Conf[ControllerSection]["dpad_shop"] = std::to_string(Settings.controller.dpad_shop); // Cheats