# Conflicts: # CHANGELOG.md # app/src/main/java/de/jeanlucmakiola/calendula/ui/common/TimelineDrag.kt # app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt
# Conflicts: # CHANGELOG.md # app/src/main/java/de/jeanlucmakiola/calendula/ui/common/TimelineDrag.kt # app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt