mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-10-06 11:48:24 +00:00
Resolves the one conflict, in CalendarReminderSettingsScreen's imports. Main (#4189) moved INav, TopBarWithBackButton, stringRes and pluralStringRes into `commons.ui`; this branch had swapped that screen's CalendarReminderPrefs for the DataStore-backed calendarReminderSettings(). The two changes are orthogonal, so the resolution takes main's package moves and keeps this branch's store, dropping the CalendarReminderPrefs import the store replaced. Also repoints a KDoc link in CalendarReminderWorker that main wrote against CalendarReminderStore, which this branch renamed to CalendarReminderLogStore. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AXvKXakvup4inNFfAhhr4L