diff options
| author | markm <markm@FreeBSD.org> | 2002-03-21 23:42:52 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2002-03-21 23:42:52 +0000 |
| commit | b38a0011c18c49fcb516cc2b4f5d751565e53f44 (patch) | |
| tree | 1ec99b3b189dcbff75d7f05f7c29bd03c4d795da /contrib/opie/opieinfo.c | |
| parent | 084b4588f24346b3d369eaf49193461c380e8521 (diff) | |
| download | FreeBSD-src-b38a0011c18c49fcb516cc2b4f5d751565e53f44.zip FreeBSD-src-b38a0011c18c49fcb516cc2b4f5d751565e53f44.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/opie/opieinfo.c')
| -rw-r--r-- | contrib/opie/opieinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/opie/opieinfo.c b/contrib/opie/opieinfo.c index 614dad6..09f9784 100644 --- a/contrib/opie/opieinfo.c +++ b/contrib/opie/opieinfo.c @@ -2,7 +2,7 @@ opieinfo: Print a user's current OPIE sequence number and seed %%% portions-copyright-cmetz-96 -Portions of this software are Copyright 1996-1998 by Craig Metz, All Rights +Portions of this software are Copyright 1996-1999 by Craig Metz, All Rights Reserved. The Inner Net License Version 2 applies to these portions of the software. You should have received a copy of the license with this software. If |
