Skip to content

Commit d63ccf9

Browse files
committed
Small Error Resolving Merge Conflict
1 parent d2b3a8d commit d63ccf9

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

src/PhpSpreadsheet/Reader/Xlsx.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,6 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
14371437
$xfrm = $oneCellAnchor->pic->spPr->children(Namespaces::DRAWINGML)->xfrm;
14381438
$outerShdw = $oneCellAnchor->pic->spPr->children(Namespaces::DRAWINGML)->effectLst->outerShdw;
14391439

1440-
$objDrawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
14411440
$objDrawing->setName(self::getArrayItemString(self::getAttributes($oneCellAnchor->pic->nvPicPr->cNvPr), 'name'));
14421441
$objDrawing->setDescription(self::getArrayItemString(self::getAttributes($oneCellAnchor->pic->nvPicPr->cNvPr), 'descr'));
14431442
$embedImageKey = self::getArrayItemString(

0 commit comments

Comments
 (0)