Module Name:	pkgsrc
Committed By:	wiz
Date:		Wed Oct 31 02:16:03 UTC 2007

Modified Files:
	pkgsrc/sysutils/gnome-vfs: Makefile Makefile.common

Log Message:
Move CONFLICTS line to correct place.


To generate a diff of this commit:
cvs rdiff -r1.63 -r1.64 pkgsrc/sysutils/gnome-vfs/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/sysutils/gnome-vfs/Makefile.common

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