CVS: moonbase/editors/vim CONFLICTS,1.1.1.1,NONE

[Terry Chan]

Update of /var/cvs/lunar/moonbase/editors/vim
In directory dbguin.lunar-linux.org:/tmp/cvs-serv622

Removed Files:
	CONFLICTS 
Log Message:
Removed the CONFLICTS file from vim and elvis.  Elvis no longer makes the
/usr/bin/vi symlink.  Only VIM does that now.  Elvis and VIM can no co-exist.


--- CONFLICTS DELETED ---