[Lunar-commits] CVS: moonbase/utils/hc-cron CONFLICTS,1.1.1.1,1.2

[Stefan Wold]

Update of /var/cvs/lunar/moonbase/utils/hc-cron
In directory espresso.foo-projects.org:/tmp/cvs-serv14783

Modified Files:
	CONFLICTS 
Log Message:
Missing conflict

Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/utils/hc-cron/CONFLICTS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- CONFLICTS	21 Aug 2002 00:55:21 -0000	1.1.1.1
+++ CONFLICTS	22 Feb 2005 10:16:42 -0000	1.2
@@ -1 +1,2 @@
-conflicts fcron
+conflicts fcron &&
+conflicts vixie-cron