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)
commit34cf4f968848bf2ba58ab2ff4e071b5d74fe61f3
tree02389073f088016d84127963fd75cfd38739c24c
parent4962f41e34a5d97f9befbda8880ebc183e36a8e0
remove leftover merge conflict

Thanks @rcanavan
.gitignore