From 2d87fd320dffbbdafdf280dda78dcfce34f024c1 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 20:27:05 +0100
Subject: [PATCH] fix merge

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 148877ed..d63b7bb2 100644
--- 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: