diff options
| author | Sterling Hughes <sterling@php.net> | 2002-07-08 21:12:07 +0000 |
|---|---|---|
| committer | Sterling Hughes <sterling@php.net> | 2002-07-08 21:12:07 +0000 |
| commit | 31d5c44ea51b6dda8d3e7b0252deeb840e0c85f6 (patch) | |
| tree | 2032dbca99691e268b2400ca756546477bc56d35 | |
| parent | c28f8fca0894ddcef0e1f8310cd07340253d891c (diff) | |
| download | php-git-31d5c44ea51b6dda8d3e7b0252deeb840e0c85f6.tar.gz | |
eek
| -rw-r--r-- | ext/xslt/sablot.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ext/xslt/sablot.c b/ext/xslt/sablot.c index b1b8640021..72ef0d5133 100644 --- a/ext/xslt/sablot.c +++ b/ext/xslt/sablot.c @@ -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) |