Resolve Merge Conflict

This commit is contained in:
oleibman
2024-06-30 00:02:46 -07:00
parent b051d4946c
commit 1253f358bf
+2 -2
View File
@@ -385,10 +385,10 @@ class Cell implements Stringable
if ($this->dataType === DataType::TYPE_FORMULA) {
try {
$index = $this->getWorksheet()->getParentOrThrow()->getActiveSheetIndex();
$selected = $this->getWorksheet()->getSelectedCells();
$thisworksheet = $this->getWorksheet();
$title = $thisworksheet->getTitle();
$index = $thisworksheet->getParentOrThrow()->getActiveSheetIndex();
$selected = $thisworksheet->getSelectedCells();
$result = Calculation::getInstance(
$thisworksheet->getParent()
)->calculateCellValue($this, $resetLog);