diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2002-06-11 21:16:51 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2002-06-11 21:16:51 +0000 |
| commit | 3c674fdc703cfcd040f14a18df8bf695a8327cdf (patch) | |
| tree | 880f6da65807015e5fdccdcf00f5a5e9a2a8809c /contrib/sendmail/cf/m4/cfhead.m4 | |
| parent | 6995a6ac420610646a5da9e1ca4a5081c427fd4c (diff) | |
| download | FreeBSD-src-3c674fdc703cfcd040f14a18df8bf695a8327cdf.zip FreeBSD-src-3c674fdc703cfcd040f14a18df8bf695a8327cdf.tar.gz | |
Resolve conflicts from sendmail 8.12.4 import
Diffstat (limited to 'contrib/sendmail/cf/m4/cfhead.m4')
| -rw-r--r-- | contrib/sendmail/cf/m4/cfhead.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4 index aae4d6e..a857c6c 100644 --- a/contrib/sendmail/cf/m4/cfhead.m4 +++ b/contrib/sendmail/cf/m4/cfhead.m4 @@ -303,4 +303,4 @@ define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'') divert(0)dnl -VERSIONID(`$Id: cfhead.m4,v 1.1.1.7 2002/02/17 21:56:44 gshapiro Exp $') +VERSIONID(`$Id: cfhead.m4,v 8.107 2001/07/22 03:25:37 ca Exp $') |
