Fixed merge conflict in .travis.yml introduced in 687703a

phansys · fabpot · commit 5238eba3a4c4 · 2014-09-18T14:23:30.000+02:00
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Doc PR        | none
diff --git a/.travis.yml b/.travis.yml
@@ -22,10 +22,6 @@ before_install:
     - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
     - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
     - sudo locale-gen fr_FR.UTF-8 && sudo update-locale
-<<<<<<< HEAD
-    - COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install
-=======
->>>>>>> 2.4
 #    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;'
 
 install:
