From 3c674fdc703cfcd040f14a18df8bf695a8327cdf Mon Sep 17 00:00:00 2001 From: gshapiro Date: Tue, 11 Jun 2002 21:16:51 +0000 Subject: Resolve conflicts from sendmail 8.12.4 import --- contrib/sendmail/praliases/praliases.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/sendmail/praliases/praliases.c') diff --git a/contrib/sendmail/praliases/praliases.c b/contrib/sendmail/praliases/praliases.c index 8f5f001..ab71ce0 100644 --- a/contrib/sendmail/praliases/praliases.c +++ b/contrib/sendmail/praliases/praliases.c @@ -20,7 +20,7 @@ SM_IDSTR(copyright, Copyright (c) 1988, 1993\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: praliases.c,v 1.1.1.7 2002/02/17 21:56:45 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: praliases.c,v 8.93 2001/09/11 04:05:07 gshapiro Exp $") /* $FreeBSD$ */ -- cgit v1.1