diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2001-05-28 17:10:35 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2001-05-28 17:10:35 +0000 |
| commit | fe77e70108d5e4da42ec6ee7e4f1bfaccd64ef04 (patch) | |
| tree | 94f6971eb38134bbccc202099b9cf11ca0d5b908 /contrib/sendmail/cf/m4/cfhead.m4 | |
| parent | 175e3eb50e42986bc6de77adab1f3e58878b2a88 (diff) | |
| download | FreeBSD-src-fe77e70108d5e4da42ec6ee7e4f1bfaccd64ef04.zip FreeBSD-src-fe77e70108d5e4da42ec6ee7e4f1bfaccd64ef04.tar.gz | |
Resolve conflicts from 8.11.4 import
Diffstat (limited to 'contrib/sendmail/cf/m4/cfhead.m4')
| -rw-r--r-- | contrib/sendmail/cf/m4/cfhead.m4 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4 index 2ad1178..db4df2f 100644 --- a/contrib/sendmail/cf/m4/cfhead.m4 +++ b/contrib/sendmail/cf/m4/cfhead.m4 @@ -225,7 +225,6 @@ define(`confRECEIVED_HEADER', `_REC_HDR_ _REC_TLS_ _REC_END_') define(`confSEVEN_BIT_INPUT', `False') -define(`confEIGHT_BIT_HANDLING', `pass8') define(`confALIAS_WAIT', `10') define(`confMIN_FREE_BLOCKS', `100') define(`confBLANK_SUB', `.') @@ -254,4 +253,4 @@ define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'') divert(0)dnl -VERSIONID(`$Id: cfhead.m4,v 8.76.4.15 2001/02/14 04:07:20 gshapiro Exp $') +VERSIONID(`$Id: cfhead.m4,v 8.76.4.16 2001/03/06 22:56:36 ca Exp $') |
