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. |
||
|---|---|---|
| .. | ||
| backend | ||
| frontend | ||
| src-tauri | ||
| __init__.py | ||
| install_llama_prebuilt.py | ||
| install_node_prebuilt.py | ||
| install_python_stack.py | ||
| install_sd_cpp_prebuilt.py | ||
| LICENSE.AGPL-3.0 | ||
| node_prebuilt_pins.json | ||
| package-lock.json | ||
| package.json | ||
| setup.bat | ||
| setup.ps1 | ||
| setup.sh | ||
| Unsloth_Studio_Colab.ipynb | ||