summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
1 files changed, 0 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 4680d2ac6..22c3b6e18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,10 +19,7 @@ env:
sudo: false
before_script:
-<<<<<<< HEAD
- sh -c "composer install --dev --no-progress"
-=======
->>>>>>> 3.1-stable
- sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi"
- sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi"
- sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'mysqli' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi"