From 836c50965a5dc057dc268d03d6b98b8f7fe3b9b1 Mon Sep 17 00:00:00 2001
From: Leandro Toledo <leandrotoledodesouza@gmail.com>
Date: Sat, 14 May 2016 23:59:45 -0300
Subject: [PATCH] Disables yapf for travis tests for py2.4 and 3.3 #259

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bd53988f5..c52f723b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ install:
   - pip install -r requirements-dev.txt
 script:
   - nosetests -v --with-flaky --no-flaky-report --with-coverage --cover-package=telegram/
-  - 'if [ $TRAVIS_PYTHON_VERSION != 2.6 ] || [ $TRAVIS_PYTHON_VERSION != 3.3 ]; then yapf -r telegram; fi'
+  - 'if [ $TRAVIS_PYTHON_VERSION != 2.6 ] && [ $TRAVIS_PYTHON_VERSION != 3.3 ]; then yapf -r telegram; fi'
   - flake8 telegram
   - 'if [ $TRAVIS_PYTHON_VERSION != 2.6 ]; then pylint -E telegram --disable=no-name-in-module,import-error; fi'
 after_success: