TASK: Resolve merge head in .travis.yml

Author: daniellienert

.travis.yml

@@ -9,29 +9,16 @@ addons:
       - oracle-java8-set-default
 matrix:
   include:
-    - php: 7.0
-      env: ES=1
-    - php: 7.0
-      env: ES=2
-<<<<<<< HEAD
     - php: 7.1
-=======
-    - php: 7.0
-      env: ES=5
-    - php: 5.6
->>>>>>> 3.0
       env: ES=1
     - php: 7.1
       env: ES=2
-    - php: 5.6
+    - php: 7.1
       env: ES=5
+
 before_install:
-<<<<<<< HEAD
   - export NEOS_TARGET_VERSION=3.0
-=======
   - export JAVA_HOME=/usr/lib/jvm/java-8-oracle
-  - export NEOS_TARGET_VERSION=2.3
->>>>>>> 3.0
   - cd ..
   - if [ "$ES" = 1 ]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.6.zip && unzip elasticsearch-1.7.6.zip && mv elasticsearch-1.7.6 elasticsearch; fi
   - if [ "$ES" = 2 ]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.4.6.zip && unzip elasticsearch-2.4.6.zip && mv elasticsearch-2.4.6 elasticsearch; fi