# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1172247932 0
# Node ID 58392653a1bd3a5482047b11b24bd2f1ce0f5c0c
# Parent  f344b5cc2fc95e1b1c4839d83b3616498b36a011
Sean didn't clean up some merge gunk, it looks like

diff -r f344b5cc2fc9 -r 58392653a1bd libpurple/util.c
--- a/libpurple/util.c	Fri Feb 23 05:16:50 2007 +0000
+++ b/libpurple/util.c	Fri Feb 23 16:25:32 2007 +0000
@@ -4144,12 +4144,5 @@
 	signal(SIGCHLD, SIG_DFL);	/* 20: child status has changed */
 	signal(SIGXCPU, SIG_DFL);	/* 24: exceeded CPU time limit */
 	signal(SIGXFSZ, SIG_DFL);	/* 25: exceeded file size limit */	
-<<<<<<< variant A
 #endif /* HAVE_SIGNAL_H */
 #endif /* !_WIN32 */
->>>>>>> variant B
-#endif /* HAVE_SIGNAL_H */
-####### Ancestor
-#endif
-======= end
-}