summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonut Biru <ibiru@archlinux.org>2010-12-06 04:22:45 -0800
committerJonny Lamb <jonny.lamb@collabora.co.uk>2010-12-06 12:25:37 +0000
commit18b44dd2909b2cb75e8cc91a80f6e6b8ba253a7f (patch)
tree58694ec5c75d484baf78e1921f3d009d9cc2f065
parenta6c7b3230e0a6ad54e5e4d3e77f025d6cb32dd67 (diff)
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>
-rw-r--r--butterfly/channel/im.py2
1 files changed, 0 insertions, 2 deletions
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')