Fix CI

twigphp · Feb 14, 2025 · 892e0bd · 892e0bd
1 parent 171262c
commit 892e0bd
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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'