From 12117be8293eff1a56b575ccc2e5d11c68c8cfcf Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 26 Jul 2016 21:19:58 +0300
Subject: Fix Travis builds

---
 .travis.yml | 3 ---
 1 file changed, 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"
-- 
cgit v1.2.3-24-g4f1b