diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2002-02-17 21:58:34 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2002-02-17 21:58:34 +0000 |
| commit | abfa0083ecf0cbde95c81f59afd36870955aeb56 (patch) | |
| tree | 7491d7ffbd831bb5ee83a1c7ccf996022f5538a5 /contrib/sendmail/src/aliases.5 | |
| parent | 514d1553cc1f49dd008e6e432664359124af60a9 (diff) | |
| download | FreeBSD-src-abfa0083ecf0cbde95c81f59afd36870955aeb56.zip FreeBSD-src-abfa0083ecf0cbde95c81f59afd36870955aeb56.tar.gz | |
Resolve conflicts from sendmail 8.12.2 import
Diffstat (limited to 'contrib/sendmail/src/aliases.5')
| -rw-r--r-- | contrib/sendmail/src/aliases.5 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/sendmail/src/aliases.5 b/contrib/sendmail/src/aliases.5 index 1910da5..c6c96f9 100644 --- a/contrib/sendmail/src/aliases.5 +++ b/contrib/sendmail/src/aliases.5 @@ -9,11 +9,11 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: aliases.5,v 8.15.4.2 2000/12/14 23:08:15 gshapiro Exp $ +.\" $Id: aliases.5,v 8.17 2000/12/14 23:09:46 gshapiro Exp $ .\" .\" $FreeBSD$ .\" -.TH ALIASES 5 "$Date: 2000/12/14 23:08:15 $" +.TH ALIASES 5 "$Date: 2000/12/14 23:09:46 $" .SH NAME aliases \- aliases file for sendmail |
