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/makemap | |
| 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/makemap')
| -rw-r--r-- | contrib/sendmail/makemap/makemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c index 1f4b098..29dd47f 100644 --- a/contrib/sendmail/makemap/makemap.c +++ b/contrib/sendmail/makemap/makemap.c @@ -20,7 +20,7 @@ SM_IDSTR(copyright, Copyright (c) 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: makemap.c,v 1.1.1.6 2002/02/17 21:56:43 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.175 2001/12/28 22:44:01 ca Exp $") /* $FreeBSD$ */ |
