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/opie.4 | |
| parent | 73aab674279668f1f9d49a4464286d6e8d1444ca (diff) | |
| download | FreeBSD-src-7833f1a4d21cf18a1fbc9f0d8d484a5e44693cdf.zip FreeBSD-src-7833f1a4d21cf18a1fbc9f0d8d484a5e44693cdf.tar.gz | |
Resolve conflicts
Diffstat (limited to 'contrib/opie/opie.4')
| -rw-r--r-- | contrib/opie/opie.4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/opie/opie.4 b/contrib/opie/opie.4 index d597dee..58fa0d3 100644 --- a/contrib/opie/opie.4 +++ b/contrib/opie/opie.4 @@ -1,7 +1,7 @@ .\" opie.4: Overview of the OPIE software. .\" .\" %%% 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 |
