From 546286f0bf049dd9274264559222c5f189f4c3e5 Mon Sep 17 00:00:00 2001
From: Bosh <michael.bosh@yandex.ru>
Date: Thu, 20 Jun 2024 02:23:06 +0800
Subject: [PATCH] Fix bug 511

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

diff --git a/requirements.txt b/requirements.txt
index 7e0c4a2..fb52918 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,11 +4,5 @@ PyYAML~=6.0
 pony==0.7.16
 snowballstemmer==2.2.0
 Werkzeug==2.2.2
-<<<<<<< HEAD
-=======
 
 pytest~=8.1.1
-<<<<<<< HEAD
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
-=======
->>>>>>> fa65055 (Fix bug 511)