harambee-public
/
led-display
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #487 from jamescurtin/bugfix-pipfile

Browse Source 
Bugfix pipfile
master
Steven Loria 6 years ago committed by GitHub
parent 9b2045c235 6567914403
commit 19d2777c22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      {{cookiecutter.app_name}}/Pipfile

4
{{cookiecutter.app_name}}/Pipfile
Unescape View File

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

Write Preview
Loading…
Cancel
Save