# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1047514256 0
# Node ID 6f0ecc21db4652bcd47fc8151e7beb6079961c16
# Parent  9d3b7b106deff99fde6cfb62d746e72f176ba240
[gaim-migrate @ 5044]
no one saw this, right? :-P

committer: Tailor Script <tailor@pidgin.im>

diff -r 9d3b7b106def -r 6f0ecc21db46 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Wed Mar 12 23:19:39 2003 +0000
+++ b/src/protocols/yahoo/yahoo.c	Thu Mar 13 00:10:56 2003 +0000
@@ -1083,21 +1083,14 @@
 {
 	struct yahoo_data *yd = (struct yahoo_data*)b->account->gc->proto_data;
 	if (b->uc & UC_UNAVAILABLE) {
-	       	if ((b->uc >> 2) != YAHOO_STATUS_CUSTOM)
+		if ((b->uc >> 2) != YAHOO_STATUS_CUSTOM)
 			return g_strdup(yahoo_get_status_string(b->uc >> 2));
 		else
 			return g_strdup(g_hash_table_lookup(yd->hash, b->name));
-<<<<<<< yahoo.c
-	} 
-	return NULL;
-} 
-    
-=======
 	}
 	return NULL;
 }
 
->>>>>>> 1.76
 static GList *yahoo_buddy_menu(struct gaim_connection *gc, char *who)
 {
 	GList *m = NULL;