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/praliases/praliases.c | |
| 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/praliases/praliases.c')
| -rw-r--r-- | contrib/sendmail/praliases/praliases.c | 2 |
1 files changed, 1 insertions, 1 deletions
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$ */ |
