Module Name:	pkgsrc
Committed By:	grant
Date:		Thu Jan 15 10:35:49 UTC 2004

Modified Files:
	pkgsrc/net/tnftp: Makefile
	pkgsrc/security/kth-krb4: Makefile

Log Message:
kth-krb4: add CONFLICT on tnftp.
tnftp: add CONFLICT on lukemftp, kth-krb4.


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 pkgsrc/net/tnftp/Makefile
cvs rdiff -r1.27 -r1.28 pkgsrc/security/kth-krb4/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.