From 08d0ce1cb96e66fbea745c88d951b2fd39678783 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 11 Sep 2009 10:00:02 +0000 Subject: [PATCH] Updated kolab and imap service - We can add both git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14229 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../kolab/admin/systems/services/kolab/class_servKolab.inc | 2 +- .../mail/admin/systems/services/imap/class_goImapServer.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gosa-plugins/kolab/admin/systems/services/kolab/class_servKolab.inc b/gosa-plugins/kolab/admin/systems/services/kolab/class_servKolab.inc index 4ba3dd9d0..96f54b7e3 100644 --- a/gosa-plugins/kolab/admin/systems/services/kolab/class_servKolab.inc +++ b/gosa-plugins/kolab/admin/systems/services/kolab/class_servKolab.inc @@ -32,7 +32,7 @@ class servkolab extends goService { var $objectclasses = array("top", "kolab"); /* Serverservice vars */ - var $conflicts = array("goImapServer","goMailServer"); + var $conflicts = array("goMailServer"); var $DisplayName = "Kolab mail service"; var $StatusFlag = ""; diff --git a/gosa-plugins/mail/admin/systems/services/imap/class_goImapServer.inc b/gosa-plugins/mail/admin/systems/services/imap/class_goImapServer.inc index 7652c26fb..323ffc249 100644 --- a/gosa-plugins/mail/admin/systems/services/imap/class_goImapServer.inc +++ b/gosa-plugins/mail/admin/systems/services/imap/class_goImapServer.inc @@ -39,7 +39,7 @@ class goImapServer extends goService { var $acl; var $Actions = array(); - var $conflicts = array("goImapServer","kolab"); + var $conflicts = array("goImapServer"); function goImapServer(&$config,$dn) { -- 2.30.2