diff --git a/.travis.yml b/.travis.yml
index e49fbf9c6..d8eba4299 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,11 @@
 language: python
 
 python:
+<<<<<<< HEAD
     - 3.2
+=======
+    - 2.7
+>>>>>>> travis probably doesn't need to test pre 3.3 either
     - 3.3
     - 3.4
     - 3.5