Fix conflict after rebase

diff --git a/src/empathy.c b/src/empathy.c
index 0b22c72f171a1a07ac8c5d940f1d08060c6c1b83..d5be4df8d4a7902dea53a3b50ef2395fda5512bb 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -636,7 +636,6 @@ main (int argc, char *argv[])
        g_object_unref (log_manager);
        g_object_unref (dispatcher);
        g_object_unref (chatroom_manager);
-       g_object_unref (ft_manager);
 #if HAVE_GEOCLUE
        g_object_unref (location_manager);
 #endif