删除奇怪的东西

src/plugins/chat/prompt_builder.py

@@ -9,11 +9,8 @@ from ..schedule.schedule_generator import bot_schedule
 from .config import global_config
 from .utils import get_embedding, get_recent_group_detailed_plain_text, get_recent_group_speaker
 from .chat_stream import chat_manager
-<<<<<<< HEAD
 from .relationship_manager import relationship_manager
-=======
 from src.common.logger import get_module_logger
->>>>>>> main-fix
 
 logger = get_module_logger("prompt")