# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1172207810 0
# Node ID f344b5cc2fc95e1b1c4839d83b3616498b36a011
# Parent  cad32dba756b9d313ce4813f08ebc9d4085c03b6# Parent  fc981ec147a6af10639c16924dec0873e0177d77
merge of 'dbd6240bc36085014ed8c0efd9549c1213bd4785'
     and 'fef1af8e40707d8feb138874ec7675ae23a50f90'

diff -r cad32dba756b -r f344b5cc2fc9 libpurple/util.c
--- a/libpurple/util.c	Thu Feb 22 23:32:39 2007 +0000
+++ b/libpurple/util.c	Fri Feb 23 05:16:50 2007 +0000
@@ -4144,6 +4144,12 @@
 	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
 }