modifiche al model user

2023-06-11 17:00:36 +02:00
parent 235508dd15 3ebca7bb4a
commit c78fa832a2
7 changed files with 271 additions and 3 deletions
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,10 @@
 	"require" : {
 		"php": "^7.3|^8.0",
 		"barryvdh/laravel-dompdf": "^2.0",
+<<<<<<< HEAD
 		"directorytree/ldaprecord": "^2.9",
+=======
+>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
 		"fruitcake/laravel-cors": "^2.0",
 		"guzzlehttp/guzzle": "^7.0.1",
 		"laravel-notification-channels/telegram": "^2.0",