Module Name:	pkgsrc
Committed By:	wiz
Date:		Thu Apr 28 14:11:13 UTC 2005

Modified Files:
	pkgsrc/security/openssh: Makefile
	pkgsrc/security/openssh+gssapi: Makefile

Log Message:
Add CONFLICTS with lsh (common man page).


To generate a diff of this commit:
cvs rdiff -r1.148 -r1.149 pkgsrc/security/openssh/Makefile
cvs rdiff -r1.21 -r1.22 pkgsrc/security/openssh+gssapi/Makefile

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