X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1691e80890e5d8ba258c51c214a3e91880e1db2b..e8635a8a1:/uip/conflict.c?ds=sidebyside

diff --git a/uip/conflict.c b/uip/conflict.c
index 29a12e79..32b1613e 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);
 }