File telepathy-butterfly-bad-import.patch of Package telepathy-butterfly

From: Ionut Biru <ibiru@archlinux.org>
Date: Mon, 6 Dec 2010 12:22:45 +0000 (-0800)
Subject: bugfix: remove bad import from im module
X-Git-Url: http://git.collabora.co.uk/?p=telepathy-butterfly.git;a=commitdiff_plain;h=18b44dd2909b2cb75e8cc91a80f6e6b8ba253a7f

bugfix: remove bad import from im module

Signed-off-by: Ionut Biru <ibiru@archlinux.org>
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
---

diff --git a/butterfly/channel/im.py b/butterfly/channel/im.py
index 1781234..ac8dd44 100644
--- a/butterfly/channel/im.py
+++ b/butterfly/channel/im.py
@@ -30,8 +30,6 @@ import papyon.event
 
 from butterfly.channel.text import ButterflyTextChannel
 
-from butterfly.Channel_Interface_Conference import CHANNEL_INTERFACE_CONFERENCE
-
 __all__ = ['ButterflyImChannel']
 
 logger = logging.getLogger('Butterfly.ImChannel')