fix git conflict

diff --git a/Makefile b/Makefile
index e417b5201909e901a6251fbb56d8c27389153bb1..a87a1c873d1c118561547d324f58f9a1182374e4 100644 (file)
--- 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