From dbb9ce2c0311b9833b835e742d7fd631c7e542cc Mon Sep 17 00:00:00 2001 From: CraftyBoss Date: Wed, 1 Jul 2026 00:51:29 -0700 Subject: [PATCH] fix merge error --- src/dusk/settings.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dusk/settings.cpp b/src/dusk/settings.cpp index 6ef79a7515..029189a007 100644 --- a/src/dusk/settings.cpp +++ b/src/dusk/settings.cpp @@ -217,6 +217,7 @@ UserSettings g_userSettings = { .serverIP {"archipelago.serverIP", "archipelago.gg"}, .serverPass {"archipelago.serverPass", ""}, .slotName {"archipelago.slotName", ""}, + }, .cosmetics = { .herosTunicCapColor = {"cosmetics.hatColor", ""},