sistemazione di alcuni file js per data Tables

app/Models/User.php

@@ -8,24 +8,14 @@ use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Laravel\Sanctum\HasApiTokens;
-<<<<<<< HEAD
 use Spatie\Permission\Traits\HasRoles;
 use Illuminate\Foundation\Auth\Access\Authorizable;
 
-=======
- //use LdapRecord\Laravel\Auth\Authenticatable;
-
-use Junges\ACL\Concerns\HasGroups;
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
 
 
 class User extends Authenticatable
 {
-<<<<<<< HEAD
     use HasApiTokens, HasFactory, Notifiable, HasRoles,Authorizable;
-=======
-    use HasApiTokens, HasFactory, Notifiable, HasGroups, SoftDeletes;
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
 
     /**
      * The attributes that are mass assignable.
@@ -57,7 +47,7 @@ class User extends Authenticatable
     protected $casts = [
         'email_verified_at' => 'datetime',
     ];
-    
+
     protected $guard_name = 'web';
 
     public function getLdapDomainColumn()
@@ -80,13 +70,12 @@ class User extends Authenticatable
     {
         return DB::table('users')->where('id','=',$id)->get();
     }
-    
+
     public static function getUsers()
     {
         return DB::table('users')->orderBy('name')->get();
     }
-<<<<<<< HEAD
-    
+
     // Aggiunge un utente e assegna un ruolo
     public static function addUser($params)
     {
@@ -95,14 +84,10 @@ class User extends Authenticatable
            'email'=>$params['email'],
            'password'=>Hash::make($params['password']),
         ])->assignRole($params['role']);
-        
+
     }
-    
-    
-=======
 
 
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
 
 
 }