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

Merge branch 'stretch-table' of https://github.com/aoloe/php-PHPWord 

into tableLayout

Conflicts:
	src/PhpWord/Writer/Word2007/Style/Table.php
This commit is contained in:
troosan 2018-02-13 23:29:53 +01:00
parent 7ddaed240f 133b727f59
commit 615c1d5576
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PhpWord/Writer/Word2007/Style/Table.php
View File

@ -110,7 +110,7 @@ class Table extends AbstractStyle
/** /**
* Enable/Disable automatic resizing of the table * Enable/Disable automatic resizing of the table
* *
* @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter * @param \PhpOffice\Common\XMLWriter $xmlWriter
* @param string $layout autofit / fixed * @param string $layout autofit / fixed
* @return void * @return void
*/ */