From: Joseph Tate <jtate@php.net>
Date: Wed, 7 Aug 2002 17:03:42 +0000 (+0000)
Subject: #Stupid.  Sorry.
X-Git-Tag: php-4.3.0dev_zend2_alpha3~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3001ecc948efe43926b7817f3a7479dfd94e3810;p=php

#Stupid.  Sorry.
---

diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index 146b915b42..63893328de 100644
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -634,11 +634,6 @@ static void php_free_xml_doc(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 static void php_free_xml_node(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 {
 	xmlNodePtr node = (xmlNodePtr) rsrc->ptr;
-<<<<<<< php_domxml.c
-
-	node_wrapper_dtor(node);
-	dom_object_set_data(node, NULL);
-=======
 
 	/* if node has no parent, it will not be freed by php_free_xml_doc, so do it here
 	and for all children as well. */
@@ -651,7 +646,6 @@ static void php_free_xml_node(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 		node_wrapper_dtor(node);
 	}
 
->>>>>>> 1.181
 }