fix merge

troosan · troosan · commit 2d87fd320dff · 2017-12-29T20:27:05.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -16,11 +16,6 @@ matrix:
         - php: 5.6
           env: COVERAGE=1
     allow_failures:
-<<<<<<< HEAD
-=======
-        - php: 7.0
-        - php: 7.1
->>>>>>> branch 'php72_support_object_classes' of https://github.com/SailorMax/PHPWord
         - php: 7.2
 
 cache:
