From aae8f58f02f2209150ed321ff5055a89678c4483 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Wed, 11 Sep 2024 15:26:06 +0200 Subject: [PATCH] Resolve conflicting file --- .github/workflows/ui-test/sanity.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index 1840e21283..527b3208d9 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -1,7 +1,6 @@ { "include": [ { - "comment": "1.7.8 ~ minor PHP 7.4" "comment": "1.7.7 ~ minor PHP 7.1 ~ 7.3" }, { @@ -167,7 +166,7 @@ "PHP_VERSION": "7.3" }, { - "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4" + "comment": "1.7.8 ~ minor PHP 7.4" }, { "PS_VERSION_START": "1.7.8.10",