# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1224392134 0
# Node ID 25aadd8c3ec7b8813e54b3d5b81b0b658cb3b9d7
# Parent  8bfa1f01f035bd576753bf7e3a3e3516e6f5fe85
Fix merge.

diff -r 8bfa1f01f035 -r 25aadd8c3ec7 libpurple/protocols/jabber/buddy.h
--- a/libpurple/protocols/jabber/buddy.h	Sun Oct 19 04:40:59 2008 +0000
+++ b/libpurple/protocols/jabber/buddy.h	Sun Oct 19 04:55:34 2008 +0000
@@ -97,8 +97,6 @@
 const char *jabber_buddy_get_status_msg(JabberBuddy *jb);
 void jabber_buddy_get_info(PurpleConnection *gc, const char *who);
 
-gboolean jabber_buddy_has_capability(JabberBuddy *jb, const gchar *cap);
-
 GList *jabber_blist_node_menu(PurpleBlistNode *node);
 
 void jabber_set_info(PurpleConnection *gc, const char *info);