a

2021-10-15 14:08:03 +08:00 · 2021-10-15 14:08:03 +08:00 · a1883eb425
commit a1883eb425
parent 584c32ad47
1 changed files with 0 additions and 4 deletions
--- 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