From a1883eb4259e11e8bc4b2cd37c96eb26f310963a Mon Sep 17 00:00:00 2001
From: pengtao <pt_yc@163.com>
Date: Fri, 15 Oct 2021 14:08:03 +0800
Subject: [PATCH] a

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

diff --git a/requests.txt b/requests.txt
index 69b0f12..1da20e7 100644
--- a/requests.txt
+++ b/requests.txt
@@ -4,8 +4,4 @@ fastapi-mail==0.3.7
 GitPython==3.1.18
 pydantic==1.8.2
 redis==3.2.1
-<<<<<<< HEAD
-
-=======
 uvicorn==0.15.0
->>>>>>> a89138ebdb67e404f724e5ee425cc5c49664498c