Skip to content

Commit

Permalink
Merge branch 'dev'. Fixe for #1.
Browse files Browse the repository at this point in the history
  • Loading branch information
brews committed Jul 21, 2017
2 parents b7c012e + 65e0143 commit 13d78f6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions ci/requirements-py35.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
name: test_env
channels:
- conda-forge
- defaults
dependencies:
- python=3.5
- cython
Expand Down
3 changes: 3 additions & 0 deletions ci/requirements-py36.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
name: test_env
channels:
- conda-forge
- defaults
dependencies:
- python=3.6
- cython
Expand Down

0 comments on commit 13d78f6

Please sign in to comment.