Mercurial > pidgin
diff libpurple/util.c @ 15687:95d67f46bb93
More icons and icon improvements
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sun, 25 Feb 2007 01:09:27 +0000 |
| parents | f344b5cc2fc9 |
| children | f75aa2bf4973 |
line wrap: on
line diff
--- 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 }