From c6067ad903b3f17eb8d95bc0ba5d2079a91ee28c Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 2 Oct 2020 12:13:42 +0200
Subject: [PATCH] gh-actions

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

diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index e07723b2..de828eeb 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -34,10 +34,6 @@ jobs:
         compiler_vendor: [gnu, clang]
         compiler_version: [new, cur, old]
     runs-on: ${{ matrix.os }}
-<<<<<<< HEAD
-    if: matrix.os != 'ubuntu-18.04' || matrix.compiler_vendor != 'clang' || matrix.compiler_version != 'old'
-=======
->>>>>>> 60a29acb... gh-actions
     env:
       CMAKE_CONFIG_TYPE: Release
       OS_VND: Linux
-- 
2.30.2