[empathy: 147/148] Fix conflict after rebase

[Cosimo Cecchi <cosimoc src gnome org>]

commit 17fec9762e1680828a73efb59f7ed155219763ac
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jun 1 18:02:03 2009 +0200

    Fix conflict after rebase
---
 src/empathy.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/empathy.c b/src/empathy.c
index 0b22c72..d5be4df 100644
--- 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