Added conflict with kolab

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3723 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc
index cd4bf05786488f63a6f7760e32c0e78e5f9637a6..c1571e64fd349168ba9929d1ac93474f31066fe4 100644 (file)
--- a/plugins/admin/systems/class_goImapServer.inc
+++ b/plugins/admin/systems/class_goImapServer.inc
@@ -10,7 +10,6 @@ class goImapServer extends plugin{
   var $objectclasses    = array("goImapServer");
   
   /* This class can't be assigned twice so it conflicts with itsself */
-  var $conflicts        = array("goImapServer");
 
   var $DisplayName      = "";
   var $dn               = NULL;
@@ -40,7 +39,8 @@ class goImapServer extends plugin{
 
   var $acl; 
 
-  var $Actions              = array();
+  var $Actions              = array();  
+  var $conflicts            = array("goImapServer","kolab");
  
   function goImapServer($config,$dn)
   {

diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc
index 1c0cdc17dbaf30daf0acfe6006fcd587c4a7063b..95fe64bd990561767d71dc2805a2bf23793e3fc7 100644 (file)
--- a/plugins/admin/systems/class_goMailServer.inc
+++ b/plugins/admin/systems/class_goMailServer.inc
@@ -10,8 +10,6 @@ class goMailServer extends plugin{
   var $objectclasses    = array("goMailServer");
 
   /* This class can't be assigned twice so it conflicts with itsself */
-  var $conflicts        = array("goMailServer");
-
   var $DisplayName      = "";
   var $dn               = NULL;
   var $StatusFlag       = "goMailServerStatus";
@@ -38,6 +36,7 @@ class goMailServer extends plugin{
   var $TransportProtocols               = array(); 
   var $Actions                          = array();
   var $cn                               = "";
+  var $conflicts                        = array("goMailServer","kolab");
 
   function goMailServer($config,$dn)
   {