Commit 2fdb9a29 authored by Elias Villiger's avatar Elias Villiger
Browse files

Merge branch 'master' into 6249-subrecord-dnd

parents ee012ddb fef1a122
Pipeline #694 passed with stage
in 1 minute and 35 seconds
...@@ -25,7 +25,6 @@ require_once(__DIR__ . '/../helper/HelperFile.php'); ...@@ -25,7 +25,6 @@ require_once(__DIR__ . '/../helper/HelperFile.php');
require_once(__DIR__ . '/../exceptions/DownloadException.php'); require_once(__DIR__ . '/../exceptions/DownloadException.php');
//require_once(__DIR__ . '/../Evaluate.php'); //require_once(__DIR__ . '/../Evaluate.php');
//require_once(__DIR__ . '/../helper/KeyValueStringParser.php'); //require_once(__DIR__ . '/../helper/KeyValueStringParser.php');
//
//require __DIR__ . '/../../../Resources/Private/vendor/autoload.php'; //require __DIR__ . '/../../../Resources/Private/vendor/autoload.php';
use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Spreadsheet;
...@@ -185,4 +184,4 @@ class Excel { ...@@ -185,4 +184,4 @@ class Excel {
return $column; return $column;
} }
} }
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment