diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2002-06-26 02:50:37 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2002-06-26 02:50:37 +0000 |
commit | 010f348bc91645e622efb979d3bba62fbce5be99 (patch) | |
tree | ba76c9e8fb1302c900b7045257cc9ab9baf1f618 /contrib/sendmail/src/conf.h | |
parent | ccc8f9377a082e37260bfd23dcdf65d7684a75a2 (diff) | |
download | FreeBSD-src-010f348bc91645e622efb979d3bba62fbce5be99.zip FreeBSD-src-010f348bc91645e622efb979d3bba62fbce5be99.tar.gz |
Resolve conflicts from import of sendmail 8.12.5
Diffstat (limited to 'contrib/sendmail/src/conf.h')
-rw-r--r-- | contrib/sendmail/src/conf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h index df6f301..fb562f4 100644 --- a/contrib/sendmail/src/conf.h +++ b/contrib/sendmail/src/conf.h @@ -10,7 +10,7 @@ * the sendmail distribution. * * - * $Id: conf.h,v 8.562 2002/05/22 19:46:26 gshapiro Exp $ + * $Id: conf.h,v 8.563 2002/06/04 02:13:50 geir Exp $ */ /* $FreeBSD$ */ |