[Telepathy-commits] [telepathy-salut/master] Fix merging problem with the darcs-git transition

[Alban Crequy]

---
 src/salut-connection.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/src/salut-connection.c b/src/salut-connection.c
index 984089a..6bc7b3e 100644
--- a/src/salut-connection.c
+++ b/src/salut-connection.c
@@ -340,14 +340,6 @@ salut_connection_get_property (GObject *object,
     case PROP_BACKEND:
       g_value_set_gtype (value, priv->backend_type);
       break;
-#ifdef ENABLE_OLPC
-    case PROP_OLPC_ACTIVITY_MANAGER:
-      g_value_set_object (value, priv->olpc_activity_manager);
-      break;
-#endif
-    case PROP_BACKEND:
-      g_value_set_gtype (value, priv->backend_type);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
-- 
1.5.6.5