From: Sterling Hughes <sterling@php.net>
Date: Mon, 8 Jul 2002 21:12:07 +0000 (+0000)
Subject: eek
X-Git-Tag: dev~383
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31d5c44ea51b6dda8d3e7b0252deeb840e0c85f6;p=php

eek
---

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)