diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2001-05-28 17:10:35 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2001-05-28 17:10:35 +0000 |
| commit | fe77e70108d5e4da42ec6ee7e4f1bfaccd64ef04 (patch) | |
| tree | 94f6971eb38134bbccc202099b9cf11ca0d5b908 /contrib/sendmail/rmail | |
| parent | 175e3eb50e42986bc6de77adab1f3e58878b2a88 (diff) | |
| download | FreeBSD-src-fe77e70108d5e4da42ec6ee7e4f1bfaccd64ef04.zip FreeBSD-src-fe77e70108d5e4da42ec6ee7e4f1bfaccd64ef04.tar.gz | |
Resolve conflicts from 8.11.4 import
Diffstat (limited to 'contrib/sendmail/rmail')
| -rw-r--r-- | contrib/sendmail/rmail/rmail.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/sendmail/rmail/rmail.c b/contrib/sendmail/rmail/rmail.c index f9f4e5e..40c5aac 100644 --- a/contrib/sendmail/rmail/rmail.c +++ b/contrib/sendmail/rmail/rmail.c @@ -12,14 +12,14 @@ #ifndef lint static char copyright[] = -"@(#) Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.\n\ +"@(#) Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.\n\ All rights reserved.\n\ Copyright (c) 1988, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* ! lint */ #ifndef lint -static char id[] = "@(#)$Id: rmail.c,v 8.39.4.11 2001/02/14 04:07:25 gshapiro Exp $"; +static char id[] = "@(#)$Id: rmail.c,v 8.39.4.12 2001/05/07 22:06:39 gshapiro Exp $"; #endif /* ! lint */ /* $FreeBSD$ */ |
