mirror of
https://github.com/OpenHands/OpenHands.git
synced 2025-12-26 05:48:36 +08:00
Resolved merge conflicts by: - Keeping main's versions of files that were deleted or moved - Re-applying PR changes to agent_chat.py and tui.py - Maintaining all PR functionality (conversation listing, loading, and completion) PR files preserved: - openhands-cli/openhands_cli/conversation_manager.py - openhands-cli/tests/test_conversation_manager.py Modified files with PR changes re-applied: - openhands-cli/openhands_cli/agent_chat.py - openhands-cli/openhands_cli/tui/tui.py Co-authored-by: openhands <openhands@all-hands.dev>