From d0ba33f7e22820b3115f968618bd34f066df6bdc Mon Sep 17 00:00:00 2001
From: Laura Tonning <tonning@gmail.com>
Date: Thu, 23 May 2024 14:11:56 +0200
Subject: [PATCH] Update dependencies

---
 composer.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 3dded72..1b6b2d9 100644
--- 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"
     },