Skip to content

Commit e4ed583

Browse files
committed
fix confilict
2 parents 6fca6e0 + 175265f commit e4ed583

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/Http/Livewire/ImportCsv.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@ class ImportCsv extends Component
1212
use WithFileUploads;
1313
use InteractsWithColumns;
1414

15-
/** @var string $model*/
15+
/** @var string */
1616
public string $model;
1717

18-
/** @var string $file*/
18+
/** @var string */
1919
public string $file;
2020

21-
/** @var array $columnsToMap */
21+
/** @var array */
2222
public array $columnsToMap = [];
2323

24-
/** @var array $requiredColumns */
24+
/** @var array */
2525
public array $requiredColumns = [];
2626

27-
/** @var array $columnLabels */
27+
/** @var array */
2828
public array $columnLabels = [];
2929

3030
public function mount()
3131
{
3232
$this->columnsToMap = $this->mapThroughColumns();
33-
33+
3434
$this->columnLabels = $this->mapThroughColumnLabels();
3535

3636
$this->requiredColumns = $this->mapThroughRequiredColumns();

tests/ImportCsvTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@
118118
'columnsToMap.name' => 'name',
119119
'columnsToMap.email' => 'email',
120120
]);
121-
});
121+
});

0 commit comments

Comments
 (0)