Update requirements.txt

adeyosemanputra · May 6, 2021 · 3551d3a · 3551d3a
1 parent d075f61
commit 3551d3a
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -3,10 +3,8 @@ Django==3.0.14
 pytz==2020.1
 sqlparse==0.3.1
 php-wsgi
-<<<<<<< Updated upstream
 pyyaml==5.1
 django-crispy-forms
-=======
-pyyaml==5.1
-django-crispy-forms
->>>>>>> Stashed changes
+
+
+