From 44ac8103d3666d92ed2ec695d1f1a8b3e6dd7882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E6=BD=AE?= <zhuchaowe@users.noreply.github.com>
Date: Wed, 20 May 2026 16:44:46 +0800
Subject: [PATCH] update dep

---
 fastapi_app.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/fastapi_app.py b/fastapi_app.py
index 80e174e..5e5ca35 100644
--- a/fastapi_app.py
+++ b/fastapi_app.py
@@ -80,16 +80,8 @@ from utils.log_util.logger import init_with_fastapi
 # Initialize logger
 logger = logging.getLogger('app')
 
-<<<<<<< HEAD
-# Import route modules
-
 from routes import chat, files, projects, system, skill_manager, database, memory
 from routes.mcp_resources import router as mcp_resources_router
-
-=======
-from routes import chat, files, projects, system, skill_manager, database, memory
-from routes.mcp_resources import router as mcp_resources_router
->>>>>>> feature/mcp-ui
 from routes.webdav import wsgidav_app