♻️ (ImageSpatie.php): refactor column assignment to improve code read…

…ability and consistency
laraxot · Jun 18, 2024 · 041c2e0 · 041c2e0
1 parent dbc9a5a
commit 041c2e0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Filament/Blocks/ImageSpatie.php b/Filament/Blocks/ImageSpatie.php
@@ -60,10 +60,6 @@ function (HasForms $livewire, SpatieMediaLibraryFileUpload $component, Temporary
                 TextInput::make('caption')
                     ->label('didascalia'),
             ])
-<<<<<<< HEAD
             ->columns('form' === $context ? 2 : 1);
-=======
-            ->columns($context === 'form' ? 2 : 1);
->>>>>>> f631be8 (Dusting)
     }
 }