From bdb2fd7324c27478b655b551db0a877e0f185238 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Thu, 13 Apr 2023 16:59:48 +0200 Subject: [PATCH] solved conflict --- composer.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.lock b/composer.lock index 266028b191c..2c2fd1476ea 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7f7c043dbf19e76df3065091ecf2b217", + "content-hash": "452bd9daf006fc8142c82272a42d108d", "packages": [ { "name": "colinmollenhour/cache-backend-redis", @@ -5771,7 +5771,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=7.4 <8.3", + "php": ">=8.1 <8.3", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", @@ -5789,7 +5789,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.4" + "php": "8.1" }, "plugin-api-version": "2.3.0" }