From 3b8aea4be2ada961cb350b94acbafcaf54462007 Mon Sep 17 00:00:00 2001 From: markm Date: Sun, 9 Jan 2000 08:53:35 +0000 Subject: resolve conflicts. --- crypto/kerberosIV/doc/kth-krb.texi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'crypto/kerberosIV/doc') diff --git a/crypto/kerberosIV/doc/kth-krb.texi b/crypto/kerberosIV/doc/kth-krb.texi index e084de0..7898dff 100644 --- a/crypto/kerberosIV/doc/kth-krb.texi +++ b/crypto/kerberosIV/doc/kth-krb.texi @@ -1,6 +1,6 @@ \input texinfo @c -*- texinfo -*- @c %**start of header -@c $Id: kth-krb.texi,v 1.77.2.1 1999/08/18 21:11:25 joda Exp $ +@c $Id: kth-krb.texi,v 1.80 1999/12/02 16:58:35 joda Exp $ @c $FreeBSD$ @setfilename kth-krb.info @settitle KTH-KRB @@ -30,7 +30,7 @@ @subtitle 1999 @author Johan Danielsson @author Assar Westerlund -@author last updated $Date: 1999/08/18 21:11:25 $ +@author last updated $Date: 1999/12/02 16:58:35 $ @def@copynext{@vskip 20pt plus 1fil@penalty-1000} @def@copyrightstart{} @@ -52,12 +52,7 @@ are met: 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. -- cgit v1.1