diff options
| author | kris <kris@FreeBSD.org> | 2000-04-10 11:18:54 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-04-10 11:18:54 +0000 |
| commit | 7833f1a4d21cf18a1fbc9f0d8d484a5e44693cdf (patch) | |
| tree | 18a7928b588cb4975327cce357578a508637e6c8 /contrib/opie/opieinfo.1 | |
| parent | 73aab674279668f1f9d49a4464286d6e8d1444ca (diff) | |
| download | FreeBSD-src-7833f1a4d21cf18a1fbc9f0d8d484a5e44693cdf.zip FreeBSD-src-7833f1a4d21cf18a1fbc9f0d8d484a5e44693cdf.tar.gz | |
Resolve conflicts
Diffstat (limited to 'contrib/opie/opieinfo.1')
| -rw-r--r-- | contrib/opie/opieinfo.1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/opie/opieinfo.1 b/contrib/opie/opieinfo.1 index b44ddf4..0b09455 100644 --- a/contrib/opie/opieinfo.1 +++ b/contrib/opie/opieinfo.1 @@ -1,7 +1,7 @@ .\" opieinfo.1: Manual page for the opieinfo(1) program. .\" .\" %%% portions-copyright-cmetz-96 -.\" Portions of this software are Copyright 1996-1997 by Craig Metz, All Rights +.\" Portions of this software are Copyright 1996-1998 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 @@ -19,6 +19,7 @@ .\" Written at Bellcore for the S/Key Version 1 software distribution .\" (keyinfo.1). .\" +.\" $FreeBSD$ .ll 6i .pl 10.5i .lt 6.0i |
