diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2002-04-20 20:34:16 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2002-04-20 20:34:16 +0000 |
| commit | 69b6924beee8d8135c10dea5036002511d676f9c (patch) | |
| tree | 2d328972fa0308788ff4acbb5c3bc4c10ead7103 /contrib/sendmail/mail.local | |
| parent | f75ef4430bd588388a758954379020119361a14d (diff) | |
| download | FreeBSD-src-69b6924beee8d8135c10dea5036002511d676f9c.zip FreeBSD-src-69b6924beee8d8135c10dea5036002511d676f9c.tar.gz | |
Resolve conflicts from import of post-8.12.3 bug fixes.
Diffstat (limited to 'contrib/sendmail/mail.local')
| -rw-r--r-- | contrib/sendmail/mail.local/mail.local.8 | 2 | ||||
| -rw-r--r-- | contrib/sendmail/mail.local/mail.local.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/sendmail/mail.local/mail.local.8 b/contrib/sendmail/mail.local/mail.local.8 index 2720578..97fd436 100644 --- a/contrib/sendmail/mail.local/mail.local.8 +++ b/contrib/sendmail/mail.local/mail.local.8 @@ -8,7 +8,7 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: mail.local.8,v 8.23 2001/04/05 23:27:35 gshapiro Exp $ +.\" $Id: mail.local.8,v 1.1.1.6 2002/02/17 21:56:42 gshapiro Exp $ .\" .\" $FreeBSD$ .\" diff --git a/contrib/sendmail/mail.local/mail.local.c b/contrib/sendmail/mail.local/mail.local.c index 3965233..d93420a 100644 --- a/contrib/sendmail/mail.local/mail.local.c +++ b/contrib/sendmail/mail.local/mail.local.c @@ -18,7 +18,7 @@ SM_IDSTR(copyright, Copyright (c) 1990, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.238 2002/03/30 07:43:21 geir Exp $") +SM_IDSTR(id, "@(#)$Id: mail.local.c,v 1.1.1.9 2002/04/10 03:04:53 gshapiro Exp $") #include <stdlib.h> #include <sm/errstring.h> |
