From 54cf0bfbf3ab6154a02ea85b0dd0badcc58dbc33 Mon Sep 17 00:00:00 2001
From: meng_xi_pan <1903647908@qq.com>
Date: Sat, 15 Mar 2025 22:04:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A5=87=E6=80=AA=E7=9A=84?=
 =?UTF-8?q?=E4=B8=9C=E8=A5=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/chat/prompt_builder.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/plugins/chat/prompt_builder.py b/src/plugins/chat/prompt_builder.py
index 23bb83e9..e8e7beee 100644
--- a/src/plugins/chat/prompt_builder.py
+++ b/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")