risolto divergenze composer.json e composer.lock

2023-06-12 10:45:25 +02:00
parent 19ea72be6c
commit dab7869fdf
2 changed files with 0 additions and 191 deletions
--- a/composer.json
+++ b/composer.json
@@ -10,10 +10,7 @@
 	"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",