[Lunar-commits] fcron: update conflicts file

[Auke Kok]

commit 2145ac67258416037a3939fe567bee9076d3787f
Author: Auke Kok <auke at foo-projects.org>
Date:   Thu Jan 10 19:12:27 2008 +0100

    fcron: update conflicts file
    
    edit missing conflict with vixie-cron
---
 utils/fcron/CONFLICTS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/utils/fcron/CONFLICTS b/utils/fcron/CONFLICTS
index d400597..43a4052 100644
--- a/utils/fcron/CONFLICTS
+++ b/utils/fcron/CONFLICTS
@@ -1 +1,2 @@
 conflicts hc-cron
+conflicts vixie-cron