Browse Source

fixing failed merge in .travis.yml

main
Julien Iguchi-Cartigny 10 years ago
parent
commit
4467421cb5
1 changed files with 0 additions and 4 deletions
  1. +0
    -4
      .travis.yml

+ 0
- 4
.travis.yml View File

@@ -2,12 +2,8 @@ language: python
env: env:
- TOX_ENV=py26 - TOX_ENV=py26
- TOX_ENV=py27 - TOX_ENV=py27
<<<<<<< HEAD
- TOX_ENV=py33 - TOX_ENV=py33
- TOX_ENV=py34 - TOX_ENV=py34
- TOX_ENV=docs
=======
>>>>>>> b004fbf
- TOX_ENV=flake8 - TOX_ENV=flake8
install: install:
- pip install tox - pip install tox


Loading…
Cancel
Save