Merge branch 'master' into skb-dev

LanceMaverick · Jun 20, 2017 · 5b6898c · 5b6898c
2 parents f54c9e3 + b6b5769
commit 5b6898c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/circle.yml b/circle.yml
@@ -5,7 +5,7 @@ dependencies:
     - pyenv local 3.5.2 3.6.0
     - pip3 install tox tox-pyenv nose
     - pip3 install -r requirements.txt
-
+    
 test:
   override:
-    - tox
+    - tox
diff --git a/tox.ini b/tox.ini
@@ -1,2 +1,2 @@
 [tox]
-envlist = py35,py36
+envlist = py35,py36