#Stupid. Sorry.

diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index 146b915b42ea8062759f3ecd11ba3f25b8a80749..63893328de2fa3978b3052cb7e6145d921a37418 100644 (file)
--- 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
 }