Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge

This commit is contained in:
troosan 2021-02-10 21:10:06 +01:00
parent d4f08a3f8a
commit 8bb0b73733
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/PhpWord/Shared/HtmlTest.php
View File

@ -640,7 +640,6 @@ class HtmlTest extends AbstractWebServerEmbeddedTest
} }
/** /**
<<<<<<< HEAD
* Tests checkbox input field * Tests checkbox input field
*/ */
public function testInputCheckbox() public function testInputCheckbox()
@ -662,10 +661,6 @@ class HtmlTest extends AbstractWebServerEmbeddedTest
/** /**
* 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
*/ */
=======
* Parse widths in tables and cells, which also allows for controlling column width
*/
>>>>>>> branch 'develop' of https://github.com/PHPOffice/PHPWord
public function testParseTableAndCellWidth() public function testParseTableAndCellWidth()
{ {
$phpWord = new \PhpOffice\PhpWord\PhpWord(); $phpWord = new \PhpOffice\PhpWord\PhpWord();