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

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 4ba3dd9d0ca72d482da86bbee9d4c2e8c21ca19a..96f54b7e33e747a674e4bfd30076e420cd026859 100644 (file)
--- 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 7652c26fb64912f179a58a032de0189247988652..323ffc2490b09f562134f8ab9a50546e050d3dca 100644 (file)
--- 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)
   {