Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Axel DEROMBLAY authored and Axel DEROMBLAY committed Aug 25, 2019
2 parents d95d863 + eb6923c commit 68e5835
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
language: python
matrix:
include:

- os: linux
python: '3.5'
- os: linux
python: '3.6'
- os: linux
python: '3.7'

- os: osx
language: generic
python: '3.5'
Expand Down Expand Up @@ -42,7 +40,6 @@ matrix:
- eval "$(pyenv init -)"
- pyenv virtualenv 3.7.2 venv
- pyenv activate venv

- os: windows
language: sh
python: '3.5'
Expand All @@ -61,7 +58,6 @@ matrix:
before_install:
- choco install python --version 3.7.2
- export PATH="/c/Python37:/c/Python37/Scripts:$PATH"

install:
- pip install coverage
- pip install codecov
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.1
0.8.1

0 comments on commit 68e5835

Please sign in to comment.