Skip to content

Commit

Permalink
Merge pull request #71 from TFA-MAIF/master
Browse files Browse the repository at this point in the history
fix conflict version travis
  • Loading branch information
TFA-MAIF committed Nov 9, 2020
2 parents 069cf6a + d7bc41e commit d97f2a0
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Sphinx==3.0.4
sphinx-bootstrap-theme==0.6.5
tox==3.5.2
twine==1.12.1
importlib-metadata>=1
psutil>=5.7.0
pytest==3.8.2
pytest-runner==4.2
Expand Down

0 comments on commit d97f2a0

Please sign in to comment.