Upstream sync needs conflict resolution #45

Upstream Silo-Server/silo-android is 30 commits ahead (b1e5774f3a). 3 files auto-resolved (hunks: theirs 6, ours 0, same 0, superset 1, import-union 1; delete-over-noise 0), but 9 files still have real conflicts.

Finish it

git clone --depth 1 https://github.com/Prairie-Server/.github prairie-dotgithub
prairie-dotgithub/upstream-sync/sync.sh prairie-android      # clones/fetches, merges, leaves a worktree
# resolve the files below in the worktree, then:
prairie-dotgithub/upstream-sync/finish.sh           # commit, audit, push, open the PR

Follow upstream-sync/AGENT-GUIDE.md in Prairie-Server/.github. sync.sh also writes a resolution brief and file batches for agents.

Conflicted files (9)

• AGENTS.md
• androidApp/src/androidMain/kotlin/org/prairieserver/prairie/android/di/AndroidModule.kt
• androidApp/src/androidMain/kotlin/org/prairieserver/prairie/android/ui/screens/requests/MyRequestsScreen.kt
• androidApp/src/androidMain/kotlin/org/prairieserver/prairie/android/ui/screens/servers/ServerListScreen.kt
• androidApp/src/androidMain/kotlin/org/prairieserver/prairie/android/ui/screens/servers/ServerListViewModel.kt
• androidTvApp/src/androidMain/kotlin/org/prairieserver/prairie/tv/ui/screens/player/TvPlayerViewModel.kt
• androidTvApp/src/androidMain/kotlin/org/prairieserver/prairie/tv/ui/screens/servers/TvServerListViewModel.kt
• shared/src/commonTest/kotlin/org/prairieserver/prairie/model/profile/ProfileQualityPreferenceTest.kt
• shared/src/commonTest/kotlin/org/prairieserver/prairie/viewmodel/RequestsViewModelTest.kt