Skip to content

Commit

Permalink
Fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
mdboom committed Oct 28, 2015
1 parent 9ac2da5 commit 606ccb9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -35,7 +35,7 @@ language: python
matrix:
include:
- python: 2.7
env: MOCK=mock
env: MOCK=mock NUMPY=numpy==1.6
- python: 3.3
- python: 3.4
- python: 3.5
Expand Down

0 comments on commit 606ccb9

Please sign in to comment.