diff options
| author | markm <markm@FreeBSD.org> | 2000-01-09 08:53:35 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2000-01-09 08:53:35 +0000 |
| commit | 3b8aea4be2ada961cb350b94acbafcaf54462007 (patch) | |
| tree | c7ad4d39cba5c19d772f332ae94cfa366244cfd4 /crypto/kerberosIV/lib/kafs | |
| parent | d4fab19dc22635ccf52db709b672a5f967edb488 (diff) | |
| download | FreeBSD-src-3b8aea4be2ada961cb350b94acbafcaf54462007.zip FreeBSD-src-3b8aea4be2ada961cb350b94acbafcaf54462007.tar.gz | |
resolve conflicts.
Diffstat (limited to 'crypto/kerberosIV/lib/kafs')
| -rw-r--r-- | crypto/kerberosIV/lib/kafs/kafs.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/crypto/kerberosIV/lib/kafs/kafs.h b/crypto/kerberosIV/lib/kafs/kafs.h index 650d6ff..cb4b000 100644 --- a/crypto/kerberosIV/lib/kafs/kafs.h +++ b/crypto/kerberosIV/lib/kafs/kafs.h @@ -14,12 +14,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Högskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors + * 3. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -36,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: kafs.h,v 1.31 1999/07/07 12:30:40 assar Exp $ */ +/* $Id: kafs.h,v 1.32 1999/12/02 16:58:40 joda Exp $ */ /* $FreeBSD$ */ #ifndef __KAFS_H |
