Re: cvs: php4 /ext/domxml php_domxml.c
| From: | Joey Smith | Date: | Sun, 26 Aug 2001 09:39:58 +0000 |
| Subject: | Re: cvs: php4 /ext/domxml php_domxml.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-7071@lists.php.net to get a copy of this message | ||
I can't get this to MFH because of the following conflict:
<<<<<<< php_domxml.c
/* $Id: php_domxml.c,v 1.67.2.1 2001/08/21 21:51:22 joey Exp $ */
=======
/* $Id: php_domxml.c,v 1.69 2001/08/26 11:36:27 joey Exp $ */
>>>>>>> 1.69
I'm thinking the correct fix for this may just be to make this line:
/* $Id$ */
But I'm not 100% sure on that...anyone know?
On Sun, 26 Aug 2001, Joey Smith wrote the following to php-cvs@lists.php.net :
> joey Sun Aug 26 07:36:28 2001 EDT
>
> Modified files:
> /php4/ext/domxml php_domxml.c
> Log:
> Fix 1st case of #9893. 2nd case was already fixed in previous commit.
>
>
>
> -/* $Id: php_domxml.c,v 1.68 2001/08/21 21:49:32 joey Exp $ */
> +/* $Id: php_domxml.c,v 1.69 2001/08/26 11:36:27 joey Exp $ */
>