Module Name:	pkgsrc
Committed By:	tron
Date:		Fri Feb 22 12:39:24 UTC 2002

Modified Files:
	pkgsrc/emulators/suse_base: Makefile

Log Message:
Remove explicit conflict for "suse_base-6.1". The package tools handle
this automatically.


To generate a diff of this commit:
cvs rdiff -r1.26 -r1.27 pkgsrc/emulators/suse_base/Makefile

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