Module Name:	pkgsrc
Committed By:	hubertf
Date:		Thu Jan 27 13:52:36 UTC 2000

Modified Files:
	pkgsrc/security/openssh: Makefile

Log Message:
Adjust CONFLICTS to not clash with the ssh-ip-tunnel package.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 pkgsrc/security/openssh/Makefile

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