# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1177719196 0
# Node ID 993baf4f7725e3467ba72defdccaba738146466e
# Parent  8748c83af14fe483a28511548c019c9457cff179# Parent  478bc85c4aece2d20ca0815f27790e61316d71a2
merge of '2f0c460433a1e198af1a0f225b83bce2c201ab32'
     and '47c411922fefd78d450f54da32cad6b5b3bd78f1'

diff -r 8748c83af14f -r 993baf4f7725 libpurple/core.c
--- a/libpurple/core.c	Sat Apr 28 00:11:25 2007 +0000
+++ b/libpurple/core.c	Sat Apr 28 00:13:16 2007 +0000
@@ -310,7 +310,6 @@
 gboolean
 purple_core_migrate(void)
 {
-#error You probably want to back up your .gaim directory right now. This revision is going to destroy it, potentially not in the way we've intended
 	const char *user_dir = purple_user_dir();
 	char *old_user_dir = g_strconcat(purple_home_dir(),
 	                                 G_DIR_SEPARATOR_S ".gaim", NULL);