Fix merge conflicts

[bsdgames-darwin.git] / countmail / countmail.6

diff --git a/countmail/countmail.6 b/countmail/countmail.6
index 25450b62b72a25fb5f021a09252193e6cb801ef9..7275c65eebeeb7aeacfd2549e8b3e876acbe81c0 100644 (file)
--- a/countmail/countmail.6
+++ b/countmail/countmail.6
@@ -1,4 +1,4 @@
-.\"    $NetBSD: countmail.6,v 1.11 2005/09/15 02:09:41 wiz Exp $
+.\"    $NetBSD: countmail.6,v 1.14 2014/03/18 18:20:36 riastradh Exp $
 .\"
 .\" Copyright (c) 1997 Matthew R. Green
 .\" All rights reserved.
@@ -11,8 +11,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -49,7 +47,7 @@ program first appeared in
 .An -nosplit
 .Nm
 was first written by
-.An Noah Friedman Aq friedman@splode.com
+.An Noah Friedman Aq Mt friedman@splode.com
 in 1993.
 This version was written by
 .An Charles M. Hannum