Update dependencies

astrogoat · May 23, 2024 · d0ba33f · d0ba33f
1 parent 6790f2f
commit d0ba33f
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -22,12 +22,8 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-<<<<<<< HEAD
-        "astrogoat/strata": "^0.6.0",
-=======
-        "astrogoat/strata": "^0.3.0|^0.4.0|^0.5.0|^0.6.0",
->>>>>>> 30d598a6e907e276a310073df0d3ea1274b6bdee
+        "php": "^8.3",
+        "astrogoat/strata": "^0.6.9",
         "spatie/laravel-package-tools": "^1.4.3",
         "illuminate/contracts": "^8.37 || ^9.9|^10.0"
     },