From 4500668e79fd69631069614586ff34fb81cb939b Mon Sep 17 00:00:00 2001
From: chakcy <947105045@qq.com>
Date: Sun, 26 Apr 2026 20:49:49 +0800
Subject: [PATCH] =?UTF-8?q?modify:=20=E4=BE=9D=E8=B5=96=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 requirements.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 542132e..3516563 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,7 @@
 aiofiles
 aiosqlite
 apscheduler
-<<<<<<< HEAD
-bcrypt==4.0.1
-=======
 bcrypt
->>>>>>> d13ad1f907ba428b8cabab840d2715cf478065df
 diskcache
 fastapi[uvicorn]
 gunicorn