From 892e0bda58184295a8b5e44cd0d3bd282225f312 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 14 Feb 2025 09:57:28 +0100
Subject: [PATCH] Fix CI

---
 .github/workflows/ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d5b5640f4..827b790a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,10 +55,6 @@ jobs:
         strategy:
             matrix:
                 php-version:
-<<<<<<< HEAD
-=======
-                    - '8.1'
->>>>>>> 3.x
                     - '8.2'
                     - '8.3'
                     - '8.4'