summaryrefslogtreecommitdiff
path: root/extra/telepathy-butterfly/0001-bugfix-remove-bad-import-from-im-module.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extra/telepathy-butterfly/0001-bugfix-remove-bad-import-from-im-module.patch')
-rw-r--r--extra/telepathy-butterfly/0001-bugfix-remove-bad-import-from-im-module.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/extra/telepathy-butterfly/0001-bugfix-remove-bad-import-from-im-module.patch b/extra/telepathy-butterfly/0001-bugfix-remove-bad-import-from-im-module.patch
deleted file mode 100644
index 6580dcc7f..000000000
--- a/extra/telepathy-butterfly/0001-bugfix-remove-bad-import-from-im-module.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 501b46c364c5608d1b3b84dd48fe57abcabd4aea Mon Sep 17 00:00:00 2001
-From: Ionut Biru <ibiru@archlinux.org>
-Date: Mon, 6 Dec 2010 04:22:45 -0800
-Subject: [PATCH] bugfix: remove bad import from im module
-
-Signed-off-by: Ionut Biru <ibiru@archlinux.org>
----
- butterfly/channel/im.py | 2 --
- 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')
---
-1.7.3.2
-