cvs: php4 /ext/xslt sablot.c
| From: | Sterling Hughes | Date: | Mon, 08 Jul 2002 21:12:06 +0000 |
| Subject: | cvs: php4 /ext/xslt sablot.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12756@lists.php.net to get a copy of this message | ||
sterling Mon Jul 8 17:12:06 2002 EDT
Modified files:
/php4/ext/xslt sablot.c
Log:
eek
Index: php4/ext/xslt/sablot.c
diff -u php4/ext/xslt/sablot.c:1.49 php4/ext/xslt/sablot.c:1.50
--- php4/ext/xslt/sablot.c:1.49 Mon Jul 8 17:04:58 2002
+++ php4/ext/xslt/sablot.c Mon Jul 8 17:12:06 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sablot.c,v 1.49 2002/07/08 21:04:58 sterling Exp $ */
+/* $Id: sablot.c,v 1.50 2002/07/08 21:12:06 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -586,9 +586,6 @@
}
/* }}} */
-<<<<<<< sablot.c
-
-=======
/* {{{ proto void xslt_free(resource processor)
Free the xslt processor up */
PHP_FUNCTION(xslt_free)
@@ -607,7 +604,6 @@
}
/* }}} */
->>>>>>> 1.48
/* {{{ free_processor()
Free an XSLT processor */
static void free_processor(zend_rsrc_list_entry *rsrc TSRMLS_DC)