diff -r 5ab2621654d4 -r 5d75cdf1698e libpurple/util.c
--- a/libpurple/util.c	Fri Feb 23 05:16:50 2007 +0000
+++ b/libpurple/util.c	Sun Feb 25 01:09:27 2007 +0000
@@ -4144,12 +4144,6 @@
 	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
 }