X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fpecl-ci;a=blobdiff_plain;f=Makefile;fp=Makefile;h=a87a1c873d1c118561547d324f58f9a1182374e4;hp=e417b5201909e901a6251fbb56d8c27389153bb1;hb=5592d53e5c8cebf7ea9cb65744c37669209b00fc;hpb=37eb5501060040441a8070a0a6c74c95ec2aed21

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