comparison libpurple/xmlnode.h @ 32697:48d35c0c6224

Fix some merging typos.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 23 Dec 2011 08:06:49 +0000
parents 5aa171c8776b
children 98520ee78f12
comparison
equal deleted inserted replaced
32696:763d65f3f758 32697:48d35c0c6224