X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fconflict.c;h=32b1613eeb158fc1d5e851337f9509faeeca1a63;hb=71932c5d0b008eb518d53f9a53978afd35a70ef5;hp=29a12e7935e150b5be51534c402c910343f5febe;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh

diff --git a/uip/conflict.c b/uip/conflict.c
index 29a12e7..32b1613 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -3,12 +3,16 @@
  * conflict.c -- check for conflicts in mail system
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/aliasbr.h>
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
 #include <grp.h>
 #include <pwd.h>
 
@@ -31,7 +35,7 @@ static struct swit switches[] = {
 #define VERSIONSW      2
     { "version", 0 },
 #define	HELPSW         3
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -134,7 +138,7 @@ main (int argc, char **argv)
 #endif	/* UCI */
     maildrops ();
 
-    done (0);
+    return done (0);
 }