Module Name:	pkgsrc
Committed By:	tv
Date:		Sat Nov 18 00:40:50 UTC 2000

Modified Files:
	pkgsrc/lang/jdk: Makefile

Log Message:
Add needed CONFLICTS.


To generate a diff of this commit:
cvs rdiff -r1.18 -r1.19 pkgsrc/lang/jdk/Makefile

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