# Conflicts: # app/src/main/java/de/jeanlucmakiola/calendula/ui/day/DayScreen.kt # app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt
# Conflicts: # app/src/main/java/de/jeanlucmakiola/calendula/ui/day/DayScreen.kt # app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt