From 8bb0b73733d5b54dfc0f09cc1a8e7b9b85feeb6d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 10 Feb 2021 21:10:06 +0100
Subject: [PATCH] fix merge

---
 tests/PhpWord/Shared/HtmlTest.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index fd5d5664..c6061632 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -640,7 +640,6 @@ class HtmlTest extends AbstractWebServerEmbeddedTest
     }
 
     /**
-<<<<<<< HEAD
      * Tests checkbox input field
      */
     public function testInputCheckbox()
@@ -659,13 +658,9 @@ class HtmlTest extends AbstractWebServerEmbeddedTest
         $this->assertEquals(0, $doc->getElement('/w:document/w:body/w:p[2]/w:r/w:fldChar/w:ffData/w:checkBox/w:checked')->getAttribute('w:val'));
     }
 
-   /**
-    * Parse widths in tables and cells, which also allows for controlling column width
-    */
-=======
+    /**
      * Parse widths in tables and cells, which also allows for controlling column width
      */
->>>>>>> branch 'develop' of https://github.com/PHPOffice/PHPWord
     public function testParseTableAndCellWidth()
     {
         $phpWord = new \PhpOffice\PhpWord\PhpWord();