Mercurial > pidgin
changeset 15683:58392653a1bd
Sean didn't clean up some merge gunk, it looks like
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Fri, 23 Feb 2007 16:25:32 +0000 |
| parents | f344b5cc2fc9 |
| children | f99e06ae143e |
| files | libpurple/util.c |
| diffstat | 1 files changed, 0 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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 -}