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/cf/m4/cfhead.m4 | |
| 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/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 a857c6c..aae4d6e 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 8.107 2001/07/22 03:25:37 ca Exp $') +VERSIONID(`$Id: cfhead.m4,v 1.1.1.7 2002/02/17 21:56:44 gshapiro Exp $') |
