ext/phar/phar.phar

From: Date: Mon, 16 Jun 2008 08:56:44 +0000
Subject: ext/phar/phar.phar
Groups: php.internals 
Request: Send a blank email to internals+get-38270@lists.php.net to get a copy of this message
ext/phar/phar.phar seems to be modified during "make" as it always conflicts here on "cvs up": P ext/phar/phar.c cvs update: nonmergeable file needs merge cvs update: revision 1.7.2.19 from repository is now in ext/phar/phar.phar cvs update: file from working directory is now in .#phar.phar.1.7.2.14 C ext/phar/phar.phar Can someone please look into this? Thanks! -- Sebastian Bergmann http://sebastian-bergmann.de/ GnuPG Key: 0xB85B5D69 / 27A7 2B14 09E4 98CD 6277 0E5B 6867 C514 B85B 5D69

« previous php.internals (#38270) next »