Module Name:	pkgsrc
Committed By:	seb
Date:		Sat Jul 31 12:52:42 UTC 2004

Modified Files:
	pkgsrc/security/ssh2: Makefile
	pkgsrc/security/ssh2-nox11: Makefile

Log Message:
Revert previous: conflicts with openssh (and others) are already specified in
Makefile.common.


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 pkgsrc/security/ssh2/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/security/ssh2-nox11/Makefile

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