I love git = stockholm syndrome

4 years ago · a48ae5310e
1 changed files with 0 additions and 3 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -1,8 +1,5 @@
 icalendar
 feedparser
 flask
-<<<<<<< HEAD
 flask_wtf
-=======
->>>>>>> 6f7d1bc591377e4541b7802bddb4a278611903a3
 requests