Fix failed diff in Travis config

zendframework · May 17, 2017 · caf9ce4 · caf9ce4
2 parents db8e85e + d35a634
commit caf9ce4
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -47,7 +47,6 @@ matrix:
         - DEPS=lowest
     - php: 7
       env:
-<<<<<<< HEAD
         - DEPS=latest
     - php: 7.1
       env:
@@ -58,11 +57,6 @@ matrix:
     - php: hhvm
       env:
         - DEPS=lowest
-=======
-        - SERVICE_MANAGER_VERSION="^2.7.5"
-        - EVENT_MANAGER_VERSION="^2.6.2"
-    - php: hhvm
->>>>>>> xtreamwayz/hotfix/slack-notifications
     - php: hhvm
       env:
         - DEPS=latest