# Conflicts: # app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefs.kt # app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsUiState.kt # app/src/main/res/values-de/strings.xml # app/src/main/res/values/strings.xml
# Conflicts: # app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefs.kt # app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsUiState.kt # app/src/main/res/values-de/strings.xml # app/src/main/res/values/strings.xml