wip

Author: mhortulanus

src/Resources/UserResource.php

@@ -31,7 +31,6 @@ public static function form(Form $form): Form
             ->schema(function ($livewire) {
                 $livewire = $livewire;
 
-<<<<<<< HEAD
                 $formFields = $livewire->getFormFields();
 
                 return array_merge([
@@ -56,18 +55,6 @@ public static function form(Form $form): Form
                         ->live(debounce: 500),
                 ], $formFields);
             });
-=======
-                Forms\Components\TextInput::make('password')
-                    ->password()
-                    ->label(__('Password'))
-                    ->revealable(Filament::arePasswordsRevealable())
-                    ->rule(Password::default())
-                    ->autocomplete('new-password')
-                    ->dehydrated(fn ($state): bool => filled($state))
-                    ->dehydrateStateUsing(fn ($state): string => Hash::make($state))
-                    ->live(debounce: 500),
-            ]);
->>>>>>> b4ca8e6041979a6d83cd9392ccaefac7790d2916
     }
 
     public static function table(Table $table): Table