From 4467421cb5104f63201ae5d5d4f82413b2d5ec61 Mon Sep 17 00:00:00 2001
From: Julien Iguchi-Cartigny <kartoch@gmail.com>
Date: Fri, 4 Jul 2014 15:51:09 +0200
Subject: [PATCH] fixing failed merge in .travis.yml

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0e756e6..ac10de9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,8 @@ language: python
 env:
   - TOX_ENV=py26
   - TOX_ENV=py27
-<<<<<<< HEAD
   - TOX_ENV=py33
   - TOX_ENV=py34
-  - TOX_ENV=docs
-=======
->>>>>>> b004fbf
   - TOX_ENV=flake8
 install:
   - pip install tox