hotfix master
... | ... | @@ -4,7 +4,6 @@ attrs==19.2.0 |
black==19.3b0 | ||
Click==7.0 | ||
coverage==5.0 | ||
<<<<<<< HEAD | ||
dj-database-url==0.5.0 | ||
Django==2.2.5 | ||
entrypoints==0.3 | ||
... | ... | @@ -14,14 +13,6 @@ isort==4.3.21 |
lazy-object-proxy==1.4.2 | ||
mccabe==0.6.1 | ||
psycopg2==2.8.4 | ||
======= | ||
Django==2.2.5 | ||
entrypoints==0.3 | ||
flake8==3.7.8 | ||
isort==4.3.21 | ||
lazy-object-proxy==1.4.2 | ||
mccabe==0.6.1 | ||
>>>>>>> 119b2431b139e52a82030f75f519a6dcd4e56364 | ||
pycodestyle==2.5.0 | ||
pyflakes==2.1.1 | ||
pylint==2.4.2 | ||
... | ... | @@ -32,8 +23,5 @@ sqlparse==0.3.0 |
toml==0.10.0 | ||
typed-ast==1.4.0 | ||
urllib3==1.25.6 | ||
<<<<<<< HEAD | ||
whitenoise==5.0.1 | ||
======= | ||
>>>>>>> 119b2431b139e52a82030f75f519a6dcd4e56364 | ||
wrapt==1.11.2 |
Please register or sign in to comment