Allow collision v7 and remove composer.lock from git to fix conflicts…

… for windows build
pelmered · May 10, 2024 · 45a12af · 45a12af
1 parent cfaf341
commit 45a12af
Showing 2 changed files with 1 addition and 11,076 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "filament/filament": "^3.0",
         "orchestra/testbench": "^8.0 || ^9.0",
         "phpstan/phpstan": "^1.10",
-        "nunomaduro/collision": "^8.1"
+        "nunomaduro/collision": "^7.0 || ^8.0"
     },
     "extra": {
         "laravel": {

diff --git a/composer.lock b/composer.lock