remove leftover merge conflict
authorMichael Wallner <mike@php.net>
Fri, 30 Sep 2016 10:12:36 +0000 (12:12 +0200)
committerGitHub <noreply@github.com>
Fri, 30 Sep 2016 10:12:36 +0000 (12:12 +0200)
Thanks @rcanavan


No differences found