summaryrefslogtreecommitdiffstats
path: root/contrib/sendmail/makemap
diff options
context:
space:
mode:
authorgshapiro <gshapiro@FreeBSD.org>2002-04-20 20:34:16 +0000
committergshapiro <gshapiro@FreeBSD.org>2002-04-20 20:34:16 +0000
commit69b6924beee8d8135c10dea5036002511d676f9c (patch)
tree2d328972fa0308788ff4acbb5c3bc4c10ead7103 /contrib/sendmail/makemap
parentf75ef4430bd588388a758954379020119361a14d (diff)
downloadFreeBSD-src-69b6924beee8d8135c10dea5036002511d676f9c.zip
FreeBSD-src-69b6924beee8d8135c10dea5036002511d676f9c.tar.gz
Resolve conflicts from import of post-8.12.3 bug fixes.
Diffstat (limited to 'contrib/sendmail/makemap')
-rw-r--r--contrib/sendmail/makemap/makemap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c
index 29dd47f..1f4b098 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 8.175 2001/12/28 22:44:01 ca Exp $")
+SM_IDSTR(id, "@(#)$Id: makemap.c,v 1.1.1.6 2002/02/17 21:56:43 gshapiro Exp $")
/* $FreeBSD$ */
OpenPOWER on IntegriCloud