From 50e6ff5f7c9c198b49fc9a455683043a6d32e7f7 Mon Sep 17 00:00:00 2001 From: M57 Date: Sun, 21 Jun 2026 13:06:11 +0300 Subject: [PATCH] fix(#236): resolve merge conflict markers in AuthManager.kt --- .../main/java/com/m57/hermescontrol/data/local/AuthManager.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt b/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt index 76400951..9ab82a72 100644 --- a/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt +++ b/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt @@ -79,11 +79,8 @@ object AuthManager { _bottomNavItemsFlow.value = getBottomNavItems() _themePreferenceFlow.value = getThemePreference() -<<<<<<< HEAD -======= _useDynamicColorsFlow.value = isUseDynamicColors() _themePresetFlow.value = getThemePreset() ->>>>>>> a9853754 (feat(#208): add Monochrome, Gruvbox, Catppuccin and AMOLED theme presets) } }