fix merge errors

2023-03-31 15:39:15 +02:00
parent a3734167cb
commit 01cf81397f
2 changed files with 4 additions and 5 deletions
--- a/src/Globals.cpp
+++ b/src/Globals.cpp
@@ -104,7 +104,6 @@ void saveSettings()
 #ifdef ULANZI
    Settings.putBool("BAT", SHOW_BAT);
 #endif
-=======
    Settings.putBool("SOUND", SOUND_ACTIVE);
    Settings.end();
 }