mirror of
https://github.com/rowboatlabs/rowboat.git
synced 2026-06-24 20:28:16 +02:00
Resolve conflicts: - apps/main/src/ipc.ts: import union (dev's gmail contacts/getAccountName + drive's google_docs/managed-picker imports). - apps/renderer/src/App.tsx: import union (dev's CodingRunBlock/KnowledgeViewMode + drive's GoogleDocPickerDialog). - apps/renderer/src/components/knowledge-view.tsx: keep the "Add Google Doc" button in the header next to the voice-note action; Search/Graph/New note are now dev's QuickActions / view-mode toggles. |
||
|---|---|---|
| .. | ||
| core | ||
| shared | ||