From 17fec9762e1680828a73efb59f7ed155219763ac Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Mon, 1 Jun 2009 18:02:03 +0200
Subject: [PATCH] Fix conflict after rebase

---
 src/empathy.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/empathy.c b/src/empathy.c
index 0b22c72f..d5be4df8 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
-- 
2.39.2