up

laraxot · Jun 12, 2024 · 5f1b4fd · 5f1b4fd
1 parent b42abd8
commit 5f1b4fd
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/Filament/Blocks/ImageSpatie.php b/Filament/Blocks/ImageSpatie.php
@@ -54,16 +54,9 @@ function (HasForms $livewire, SpatieMediaLibraryFileUpload $component, Temporary
                         }
                     ),
 
-<<<<<<< HEAD
                 TextInput::make('caption')
                     ->label('didascalia'),
             ])
             ->columns('form' === $context ? 2 : 1);
-=======
-                TextInput::make('caption'),
-            ])
-            ->columns('form' === $context ? 2 : 1)
-        ;
->>>>>>> up
     }
 }