[Telepathy-commits] [telepathy-python/master] server/channel.py: remove CallMerging interface as it's an experimental one

[Guillaume Desmottes]

---
 src/server/channel.py |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/server/channel.py b/src/server/channel.py
index b839e15..91e5ffa 100644
--- a/src/server/channel.py
+++ b/src/server/channel.py
@@ -226,10 +226,6 @@ class ChannelTypeText(Channel, _ChannelTypeTextIface):
         self._pending_messages[id] = (timestamp, sender, type, flags, text)
 
 
-from telepathy._generated.Channel_Interface_Call_Merging \
-        import ChannelInterfaceCallMerging
-
-
 from telepathy._generated.Channel_Interface_Chat_State \
         import ChannelInterfaceChatState
 
-- 
1.5.6.5