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/ftpcmd.y | |
| parent | 73aab674279668f1f9d49a4464286d6e8d1444ca (diff) | |
| download | FreeBSD-src-7833f1a4d21cf18a1fbc9f0d8d484a5e44693cdf.zip FreeBSD-src-7833f1a4d21cf18a1fbc9f0d8d484a5e44693cdf.tar.gz | |
Resolve conflicts
Diffstat (limited to 'contrib/opie/ftpcmd.y')
| -rw-r--r-- | contrib/opie/ftpcmd.y | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/opie/ftpcmd.y b/contrib/opie/ftpcmd.y index 494dc81..ea5bb36 100644 --- a/contrib/opie/ftpcmd.y +++ b/contrib/opie/ftpcmd.y @@ -1,7 +1,7 @@ /* ftpcmd.y: yacc parser for the FTP daemon. %%% 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 @@ -21,6 +21,8 @@ you didn't get a copy, you may request one from <license@inner.net>. PORT attack fixes from Hobbit. Modified at NRL for OPIE 2.0. Originally from BSD. + +$FreeBSD$ */ /* * Copyright (c) 1985, 1988 Regents of the University of California. |
