From 5592d53e5c8cebf7ea9cb65744c37669209b00fc Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 12 Jan 2021 17:31:24 +0100
Subject: [PATCH] fix git conflict

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

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
-- 
2.30.2