mirror of
https://github.com/eigent-ai/eigent.git
synced 2026-04-30 12:40:10 +00:00
Resolved conflicts in: - server/app/controller/chat/history_controller.py: Combined status tracking logic from both branches, including failed task counting from main - src/components/GroupedHistoryView/index.tsx: Kept all imports and features from project-history-ui branch - src/pages/Dashboard/Project.tsx: Kept the new GroupedHistoryView implementation from project-history-ui branch - Removed conflicted __pycache__ files (binary conflicts) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| chat | ||
| config | ||
| mcp | ||
| oauth | ||
| provider | ||
| user | ||
| __init__.py | ||
| health_controller.py | ||
| redirect_controller.py | ||