remove conflict marker
authorMichael Wallner <mike@php.net>
Sat, 13 Feb 2016 08:07:12 +0000 (09:07 +0100)
committerMichael Wallner <mike@php.net>
Sat, 13 Feb 2016 08:07:12 +0000 (09:07 +0100)
commit45dfbc4e19232105da306b0028387a5d354bec93
treed578c14e9dc92f3483aaf0359d9d6d9da8b7df4d
parent525371f4be2ce8ee66b85fdbc5f6ebd819a2a004
remove conflict marker
[ci skip]
README.md