Module Name:	pkgsrc
Committed By:	xtraeme
Date:		Tue Jan  6 05:11:16 UTC 2004

Modified Files:
	pkgsrc/devel/cvsup: Makefile.common

Log Message:
Remove CONFLICTS, it's not needed here.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 pkgsrc/devel/cvsup/Makefile.common

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