# HG changeset patch # User Andreas Monitzer # Date 1184208960 0 # Node ID c4d1a940aa838ebd27cbcd98bf34ae462f49fc89 # Parent 42d9a1b56d085de05414bcf5c5174d17ab89527e Having the option of test compiling during merge conflict resolving would be a great feature... diff -r 42d9a1b56d08 -r c4d1a940aa83 libpurple/util.c --- a/libpurple/util.c Thu Jul 12 02:53:43 2007 +0000 +++ b/libpurple/util.c Thu Jul 12 02:56:00 2007 +0000 @@ -1732,6 +1732,7 @@ struct purple_parse_tag *pt = tag->data; if(!pt->ignore) g_string_append_printf(xhtml, "", pt->dest_tag); + } } g_list_free(tags); if(xhtml_out)