From 95b2a6741b45909780c971341f70494c71a2b4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=A6=E6=BA=AA=E7=95=94?=
 <130263765+na10xi27da@users.noreply.github.com>
Date: Sat, 15 Mar 2025 21:23:37 +0800
Subject: [PATCH] Update prompt_builder.py

---
 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 23bb83e92..e8e7beeec 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")