gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix a problem with conflict resolution on the last checkin

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/nsxml_using_libxml2@34735 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Doug Simons 2012-02-07 19:20:58 +00:00
parent 816017aec4
commit 576a1c2915
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/NSXMLNode.m
View file

@ -952,14 +952,10 @@ NSLog(@"RELEASING TRICKY EXTRA RETAIN in %@ now: %d", self, internal->externalRe
node->_private = NULL;
if (node && node->parent == NULL)
{
<<<<<<< .mine
if (node->type == XML_DOCUMENT_NODE)
xmlFreeDoc((xmlDocPtr)node);
else
xmlFreeNode(node); // the top level node frees the entire tree
=======
xmlFreeNode(node); // the top level node frees the entire tree
>>>>>>> .r34733
}
GS_DESTROY_INTERNAL(NSXMLNode);
}