Resolve conflict

Forgot to save the file before committing...
squizlabs · Mar 5, 2021 · 6614feb · 6614feb
1 parent 0fe896a
commit 6614feb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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'