Merge pull request #487 from jamescurtin/bugfix-pipfile

Bugfix pipfile
master
Steven Loria 6 years ago committed by GitHub
commit 19d2777c22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      {{cookiecutter.app_name}}/Pipfile

@ -49,12 +49,8 @@ environs = "==4.1.3"
# Testing
pytest = "==4.5.0"
WebTest = "==2.0.33"
<<<<<<< HEAD
factory-boy = "==2.12.*"
=======
factory-boy = "==2.11.*"
pdbpp = "==0.10.0"
>>>>>>> ae5c375... Implement docker environment
# Lint and code style
flake8 = "==3.7.7"

Loading…
Cancel
Save