Module Name:	pkgsrc
Committed By:	rillig
Date:		Sun Mar 12 17:05:08 UTC 2006

Modified Files:
	pkgsrc/editors/vim-kde: Makefile

Log Message:
Readded the CONFLICTS line for pkg_alternatives. This package does not
really conflict with pkg_alternatives, but with the various vim packages
that can be installed via pkg_alternatives. Thanks to wiz for noting
this.


To generate a diff of this commit:
cvs rdiff -r1.35 -r1.36 pkgsrc/editors/vim-kde/Makefile

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