Resolve the app-sidebar.tsx conflict: main refactored the chat-export dropdown to a format-based CHAT_EXPORT_OPTIONS + dynamic-import exportConversationByFormat dispatcher, which the merged body already uses. Keep main's dispatcher and drop the branch's static export imports; keep TestTubeOutlineIcon imported from the shared @/lib/hugeicons-derived module (also used by images-page) rather than main's duplicate inline definition. The branch's Images and Video nav items are preserved. |
||
|---|---|---|
| .. | ||
| data_recipe | ||
| .gitkeep | ||
| __init__.py | ||
| auth.py | ||
| chat_history.py | ||
| datasets.py | ||
| export.py | ||
| inference.py | ||
| llama.py | ||
| mcp_servers.py | ||
| models.py | ||
| preview.py | ||
| prompts.py | ||
| providers.py | ||
| rag.py | ||
| settings.py | ||
| training.py | ||
| training_history.py | ||
| training_vram.py | ||
| video.py | ||