maiku.vv: e27dec62: Fix merge.

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: e27dec62113f7fa6c149e927bef4838231e7315a
Ancestor: d40ae24f7705b8f2f6dc4334b02a00f7b9cd5ac7
Author: maiku at soc.pidgin.im
Date: 2008-10-19T04:55:34
Branch: im.pidgin.maiku.vv
URL: http://d.pidgin.im/viewmtn/revision/info/e27dec62113f7fa6c149e927bef4838231e7315a

Modified files:
        libpurple/protocols/jabber/buddy.h

ChangeLog: 

Fix merge.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/buddy.h	9a4576e0e2e26a201544c625dba0bea18079b29d
+++ libpurple/protocols/jabber/buddy.h	b72ccdfffb3ac98b1f2cab34a3fddfef59c086e5
@@ -97,8 +97,6 @@ void jabber_buddy_get_info(PurpleConnect
 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);