From: psc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 26 May 2009 09:21:40 +0000 (+0000)
Subject: Make repository class only conflict with itself (so
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=504b43e0425358118acd168e8a712292b336c3a2;p=gosa.git

Make repository class only conflict with itself (so
that a repository service cannot be added twice) instead
of conflicting with goKioskService, which made
it impossible to have both services on one machine.
(Trac: #2641)


git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13668 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/trunk/gosa-plugins/fai/admin/systems/services/repository/class_servRepository.inc b/trunk/gosa-plugins/fai/admin/systems/services/repository/class_servRepository.inc
index 3a097e261..645144cf2 100644
--- a/trunk/gosa-plugins/fai/admin/systems/services/repository/class_servRepository.inc
+++ b/trunk/gosa-plugins/fai/admin/systems/services/repository/class_servRepository.inc
@@ -10,7 +10,7 @@ class servrepository extends goService
   /* Repositories */
   var $repositories          = array();
   var $FAIrepository         = array();
-  var $conflicts             = array("goKioskService");
+  var $conflicts             = array("servrepository");
   var $DisplayName           = "";
   var $StatusFlag            = "";