From 504b43e0425358118acd168e8a712292b336c3a2 Mon Sep 17 00:00:00 2001 From: psc Date: Tue, 26 May 2009 09:21:40 +0000 Subject: [PATCH] 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 --- .../admin/systems/services/repository/class_servRepository.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = ""; -- 2.30.2