fix git conflict
authorMichael Wallner <mike@php.net>
Tue, 12 Jan 2021 16:31:24 +0000 (17:31 +0100)
committerMichael Wallner <mike@php.net>
Tue, 12 Jan 2021 16:31:24 +0000 (17:31 +0100)
commit5592d53e5c8cebf7ea9cb65744c37669209b00fc
treeb1d7177d26c42ed76ef8964ec81cbb8610590dee
parent37eb5501060040441a8070a0a6c74c95ec2aed21
fix git conflict
Makefile