Fix merge

mdboom · mdboom · commit 606ccb9d78fc · 2015-10-28T11:04:12.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -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
