From 8e10468cf4f3e79d36ec270c70236e533de2e250 Mon Sep 17 00:00:00 2001 From: "yumou.zhangym" Date: Tue, 16 Apr 2024 17:59:03 +0800 Subject: [PATCH] feat: merge --- server/main.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/main.py b/server/main.py index e5a520db..5478f52d 100644 --- a/server/main.py +++ b/server/main.py @@ -11,11 +11,7 @@ from data_class import ChatData # Import fastapi routers -<<<<<<< HEAD -from routers import bot, health_checker, github -======= from routers import bot, health_checker, github, rag ->>>>>>> new-branch-name open_api_key = get_env_variable("OPENAI_API_KEY") is_dev = bool(get_env_variable("IS_DEV"))