minor #11946 [CI] Fixed merge conflict in .travis.yml (phansys)
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #11946). Discussion ---------- [CI] Fixed merge conflict in .travis.yml Fixed merge conflict in .travis.yml introduced in687703a75e
| Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Doc PR | none Commits -------5238eba
Fixed merge conflict in .travis.yml introduced in687703a75e
This commit is contained in:
commit
679df19235
@ -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:
|
||||
|
Reference in New Issue
Block a user