diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-04 16:01:25 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-04 16:01:49 +0100 |
| commit | f5f6b834f894eaa285b8db1e47f86de3e9d71a48 (patch) | |
| tree | a10572d7691a2ff1be9c056a2ec1b735a1c7e6f4 | |
| parent | 1a31f03a7b89e2a88f188e9f68c96469aa40be79 (diff) | |
| download | forums-f5f6b834f894eaa285b8db1e47f86de3e9d71a48.tar forums-f5f6b834f894eaa285b8db1e47f86de3e9d71a48.tar.gz forums-f5f6b834f894eaa285b8db1e47f86de3e9d71a48.tar.bz2 forums-f5f6b834f894eaa285b8db1e47f86de3e9d71a48.tar.xz forums-f5f6b834f894eaa285b8db1e47f86de3e9d71a48.zip | |
[develop] Remove left over conflict marker from merge 1a31f03
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 3317024ded..a077ade0b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ before_script: - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" script: -<<<<<<< HEAD - cd build - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' ]; then ../phpBB/vendor/bin/phing sniff; fi" - cd .. |