From 6614feb5ea9f942fd5995b774d8990fc66be5a82 Mon Sep 17 00:00:00 2001
From: Greg Sherwood <gsherwood@squiz.net>
Date: Fri, 5 Mar 2021 12:00:52 +1100
Subject: [PATCH] Resolve conflict

Forgot to save the file before committing...
---
 .github/workflows/test.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a03fb5a1a1..ced5d4b61b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -79,11 +79,7 @@ jobs:
         run: vendor/bin/phpunit
 
       - name: 'PHPCS: check code style without cache, no parallel'
-<<<<<<< HEAD
-        if: ${{ matrix.custom_ini  == false }}
-=======
         if: ${{ matrix.custom_ini == false && matrix.php != 7.4 }}
->>>>>>> a7b2b955c... GH Actions: report CS violations in the PR
         run: php bin/phpcs --no-cache --parallel=1
 
       - name: 'PHPCS: check code style to show results in PR'