[Lunar-commits] <moonbase> Ultimate: updated CONFLICTS

[Duncan Gibson]

commit 61a4e8a8581ce0b4aae9bdfd993ca3159c71d8e9
Author: Duncan Gibson <engelsman at lunar-linux.org>
Date:   Sun Jul 12 20:02:24 2009 +0200

    Ultimate: updated CONFLICTS
    
    removed dancer-ircd now that it has been removed from moonbase
---
 chat/Ultimate/CONFLICTS |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/chat/Ultimate/CONFLICTS b/chat/Ultimate/CONFLICTS
index 793e87e..705cf38 100644
--- a/chat/Ultimate/CONFLICTS
+++ b/chat/Ultimate/CONFLICTS
@@ -1,2 +1 @@
-conflicts ircd &&
-conflicts dancer-ircd
+conflicts ircd