Module Name:	pkgsrc
Committed By:	kei
Date:		Wed Mar  7 07:07:12 UTC 2001

Modified Files:
	pkgsrc/converters/rpm2cpio: Makefile
	pkgsrc/misc/rpm: Makefile

Log Message:
add CONFLICTS as misc/rpm package has rpm2cpio program.  Problem noted by
IWAMOTO Toshihiro in private mail.  Thanks.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/converters/rpm2cpio/Makefile
cvs rdiff -r1.26 -r1.27 pkgsrc/misc/rpm/Makefile

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