From b56fbe144057cc3e734d812bd4eac0e0bd4d7bb2 Mon Sep 17 00:00:00 2001 From: kalaposfos13 <153381648+kalaposfos13@users.noreply.github.com> Date: Tue, 15 Apr 2025 18:17:50 +0200 Subject: [PATCH] Fix merge --- src/common/config.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/config.cpp b/src/common/config.cpp index ff2ae7f34..6a0810346 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -77,7 +77,6 @@ static double trophyNotificationDuration = 6.0; static bool useUnifiedInputConfig = true; static bool overrideControllerColor = false; static int controllerCustomColorRGB[3] = {0, 0, 255}; -static bool separateupdatefolder = false; static bool compatibilityData = false; static bool checkCompatibilityOnStartup = false; static std::string trophyKey;