From 5238eba3a4c4de812d986a556e78d81fe1c7121e Mon Sep 17 00:00:00 2001
From: Javier Spagnoletti <phansys@gmail.com>
Date: Wed, 17 Sep 2014 22:52:32 -0300
Subject: [PATCH] Fixed merge conflict in .travis.yml introduced in
 687703a75ed741464e15b71a1e576c319865f3fd

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Doc PR        | none
---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ccf065f8f3..14c7704c4c 100644
--- 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: