eek

diff --git a/ext/xslt/sablot.c b/ext/xslt/sablot.c
index b1b8640021130b4b7450586e52d0b779209bd7b9..72ef0d5133ff34ec3466ec1448b207e686378512 100644 (file)
--- 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)