Fix requirements

2018-11-20 12:59:44 -05:00 · 2018-11-20 12:59:44 -05:00 · 1c0b251bd0
commit 1c0b251bd0
parent f962a7e0fa
2 changed files with 1 additions and 1 deletions
--- a/requirements-devel.txt
+++ b/requirements-devel.txt
@ -38,4 +38,3 @@ typing==3.6.6             # via curtsies
 urllib3==1.23             # via requests
 wcwidth==0.1.7            # via curtsies
 wrapt==1.10.11            # via astroid
->>>>>>> Upgrade to Django 2.1 using pip-tools
--- a/requirements-test.in
+++ b/requirements-test.in
@ -2,3 +2,4 @@ pytest
 pytest-django
 pytest-cov
 django-override-storage
+selenium