Merge branch 'main' of http://187.216.152.151:9999/Damian_Aceves/PrestamosTecmm

composer.json

@@ -12,13 +12,7 @@
         "laravel/sanctum": "^3.2",
         "laravel/tinker": "^2.8",
         "laravel/ui": "^4.6",
-        "maatwebsite/excel": "^1.1",
+        "maatwebsite/excel": "^1.1"
-<<<<<<< HEAD
-        "phpoffice/phpspreadsheet": "^4.1"
-=======
-        "phpoffice/phpspreadsheet": "^4.1",
-        "psr/simple-cache": "2.0"
->>>>>>> 808a4a99e0ba6f66a69b363ca9c10dd59496c060
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",