mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-10-05 19:28:25 +00:00
Three import-only conflicts (MultiOrchestrator, MarmotGroupChatView, MarmotGroupListScreen), resolved as the union of both sides with AccountViewModel at its new commons.viewmodels package. Main's new MarmotGroupPreview is repointed the same way, and DecryptAndIndexProcessor (commonMain) gains the kotlinx.coroutines.IO import main's change needed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S7FuNBSKiyVecARSoE4B9P