mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
eek
This commit is contained in:
parent
c28f8fca08
commit
31d5c44ea5
@ -586,9 +586,6 @@ PHP_FUNCTION(xslt_error)
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
<<<<<<< sablot.c
|
||||
|
||||
=======
|
||||
/* {{{ proto void xslt_free(resource processor)
|
||||
Free the xslt processor up */
|
||||
PHP_FUNCTION(xslt_free)
|
||||
@ -607,7 +604,6 @@ PHP_FUNCTION(xslt_free)
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
>>>>>>> 1.48
|
||||
/* {{{ free_processor()
|
||||
Free an XSLT processor */
|
||||
static void free_processor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
|
||||
|
Loading…
Reference in New Issue
Block a user