X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fconflict.c;h=c0ba63ba984af3a8281b34d774611945794eb2fd;hb=ef25ef28586541f0804dc6aa53a8519cf762ba6d;hp=29a12e7935e150b5be51534c402c910343f5febe;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh diff --git a/uip/conflict.c b/uip/conflict.c index 29a12e7..c0ba63b 100644 --- a/uip/conflict.c +++ b/uip/conflict.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include @@ -31,7 +31,7 @@ static struct swit switches[] = { #define VERSIONSW 2 { "version", 0 }, #define HELPSW 3 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -134,7 +134,7 @@ main (int argc, char **argv) #endif /* UCI */ maildrops (); - done (0); + return done (0); }