From: Michael Wallner <mike@php.net>
Date: Tue, 12 Jan 2021 16:31:24 +0000 (+0100)
Subject: fix git conflict
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5592d53e5c8cebf7ea9cb65744c37669209b00fc;p=m6w6%2Fpecl-ci

fix git conflict
---

diff --git a/Makefile b/Makefile
index e417b52..a87a1c8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,6 @@
 export
 
-<<<<<<< HEAD
-PHP ?= 7.4
-=======
 PHP ?= 8.0
->>>>>>> 3cab5c6 (support for github workflow steps)
 JOBS ?= 2
 PHP_MIRROR ?= https://php.net/distributions/
 TMPDIR ?= /tmp