Peter Cowburn wrote: > On 24 June 2015 at 03:25, Hannes Magnusson <[email protected]> > wrote: > >> This looks like a bad merge. Are you sure everything is OK? > > *shrug* I have no idea why Git shows the merge like that. However, the > file looks okay to me.
The Github diff looks also rather different: <https://github.com/php/web-php/commit/d21f458fc610449296d5153b1636c6a46976b093>. Nice Easter eggs, by the way! :) -- Christoph M. Becker -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
