Merge pull request laraxot#30 from EgeatechSRL/dev

.
aurmich · Dec 6, 2024 · adeccf5 · adeccf5
2 parents 746060a + 2e2177f
commit adeccf5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 33 deletions.
diff --git a/Filament/Resources/ActivityResource/Pages/ListActivities.php b/Filament/Resources/ActivityResource/Pages/ListActivities.php
@@ -16,14 +16,9 @@ public function getListTableColumns(): array
     {
         return [
             Tables\Columns\TextColumn::make('id')
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/dev
                 ->sortable(),
             Tables\Columns\TextColumn::make('description'),
             Tables\Columns\TextColumn::make('created_at')
-
                 ->sortable(),
         ];
     }

diff --git a/Filament/Resources/StoredEventResource/Pages/ListStoredEvents.php b/Filament/Resources/StoredEventResource/Pages/ListStoredEvents.php
@@ -18,34 +18,8 @@ public function getListTableColumns(): array
             Tables\Columns\TextColumn::make('id'),
             Tables\Columns\TextColumn::make('event_class'),
             // Tables\Columns\TextColumn::make('event_properties'),
-            Tables\Columns\ViewColumn::make('event_properties')->view('activity::filament.tables.columns.event-properties'),
+            Tables\Columns\ViewColumn::make('event_properties')
+                ->view('activity::filament.tables.columns.event-properties'),
         ];
     }
-<<<<<<< HEAD
-
-    public function getTableActions(): array
-    {
-        return [
-            EditAction::make()
-                ->label(''),
-        ];
-    }
-
-    public function getTableBulkActions(): array
-    {
-        return [
-            DeleteBulkAction::make(),
-        ];
-    }
-
-
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\CreateAction::make(),
-        ];
-    }
-=======
->>>>>>> origin/dev
 }