Fix merge

mdboom · mdboom · commit 603bce877220 · 2015-10-28T17:22:35.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -35,9 +35,7 @@ language: python
 matrix:
   include:
     - python: 2.7
-      env: MOCK=mock NUMPY=numpy==1.6
-    - python: 2.7
-      env: PANDAS=pandas MOCK=mock
+      env: MOCK=mock
     - python: 3.3
     - python: 3.4
     - python: 3.5
