From 010f348bc91645e622efb979d3bba62fbce5be99 Mon Sep 17 00:00:00 2001
From: gshapiro <gshapiro@FreeBSD.org>
Date: Wed, 26 Jun 2002 02:50:37 +0000
Subject: Resolve conflicts from import of sendmail 8.12.5

---
 contrib/sendmail/src/conf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'contrib/sendmail/src/conf.h')

diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h
index df6f301..fb562f4 100644
--- a/contrib/sendmail/src/conf.h
+++ b/contrib/sendmail/src/conf.h
@@ -10,7 +10,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: conf.h,v 8.562 2002/05/22 19:46:26 gshapiro Exp $
+ *	$Id: conf.h,v 8.563 2002/06/04 02:13:50 geir Exp $
  */
 
 /* $FreeBSD$ */
-- 
cgit v1.1