From: Michael Wallner <mike@php.net>
Date: Sat, 13 Feb 2016 08:07:12 +0000 (+0100)
Subject: remove conflict marker
X-Git-Tag: RELEASE_3_0_1~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=45dfbc4e19232105da306b0028387a5d354bec93;hp=45dfbc4e19232105da306b0028387a5d354bec93;p=m6w6%2Fext-http

remove conflict marker
[ci skip]
---