[Telepathy-commits] [telepathy-gabble/master] Fix previous conflict

[Alban Crequy]

---
 src/private-tubes-factory.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index a16a99a..58c83b9 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -977,13 +977,6 @@ static const gchar * const old_tubes_channel_allowed_properties[] = {
     TP_IFACE_CHANNEL ".TargetID",
     NULL
 };
-static const gchar * const dbus_tube_channel_allowed_properties[] = {
-    TP_IFACE_CHANNEL ".TargetHandle",
-    TP_IFACE_CHANNEL ".TargetID",
-    GABBLE_IFACE_CHANNEL_INTERFACE_TUBE ".Parameters",
-    GABBLE_IFACE_CHANNEL_TYPE_DBUS_TUBE ".ServiceName",
-    NULL
-};
 static const gchar * const stream_tube_channel_allowed_properties[] = {
     TP_IFACE_CHANNEL ".TargetHandle",
     TP_IFACE_CHANNEL ".TargetID",
-- 
1.5.6.5