summaryrefslogtreecommitdiffstats
path: root/contrib/sendmail/src/conf.c
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/src/conf.c
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/src/conf.c')
-rw-r--r--contrib/sendmail/src/conf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c
index 30022c6..06a48eb 100644
--- a/contrib/sendmail/src/conf.c
+++ b/contrib/sendmail/src/conf.c
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: conf.c,v 8.961 2002/04/04 21:32:14 gshapiro Exp $")
+SM_RCSID("@(#)$Id: conf.c,v 1.1.1.12 2002/04/10 03:04:48 gshapiro Exp $")
/* $FreeBSD$ */
OpenPOWER on IntegriCloud