# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1265746450 0
# Node ID c9866e46f6290a1a0b8240835e0cfa2277b958db
# Parent  9b4b5bdc57d80160315aa555b9b898fb65a284a6
Some code got duplicated during merge...

diff -r 9b4b5bdc57d8 -r c9866e46f629 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Mon Feb 08 22:10:41 2010 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Tue Feb 09 20:14:10 2010 +0000
@@ -6199,8 +6199,6 @@
 			return "admin";
 		if (userinfo->flags & AIM_FLAG_ACTIVEBUDDY)
 			return "bot";
-		if (userinfo->capabilities & OSCAR_CAPABILITY_HIPTOP)
-			return "hiptop";
 		if (userinfo->capabilities & OSCAR_CAPABILITY_SECUREIM)
 			return "secure";
 		if (userinfo->icqinfo.status & AIM_ICQ_STATE_BIRTHDAY)