[Lunar-commits] CVS: moonbase/zbeta/vim-cvs CONFLICTS,1.1,1.2

[Terry Chan]

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

Modified Files:
	CONFLICTS 
Log Message:
Removed the conflicts with elvis.  Elvis no longer conflicts with vim or vim-cvs.


Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/vim-cvs/CONFLICTS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFLICTS	20 Mar 2003 05:12:24 -0000	1.1
+++ CONFLICTS	9 Feb 2004 02:34:28 -0000	1.2
@@ -1,2 +1 @@
-conflicts  elvis &&
 conflicts  vim