modifiche al model user

app/Models/User.php

@@ -8,14 +8,24 @@ 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.
@@ -75,6 +85,7 @@ class User extends Authenticatable
     {
         return DB::table('users')->orderBy('name')->get();
     }
+<<<<<<< HEAD
     
     // Aggiunge un utente e assegna un ruolo
     public static function addUser($params)
@@ -88,6 +99,10 @@ class User extends Authenticatable
     }
     
     
+=======
+
+
+>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
 
 
 }