From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 27 Jul 2010 10:08:32 +0000 (+0000)
Subject: Updated several service dialogs, fixed typos, string, html, post handling and more.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=90868180703f07c19335c6bce701f4fd041721d9;p=gosa.git

Updated several service dialogs, fixed typos, string, html, post handling and more.

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

diff --git a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
index 760b2d0af..2a5096c02 100644
--- a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
+++ b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
@@ -9,7 +9,7 @@ class rSyslogServer extends goService{
     var $StatusFlag       = "";
 
     /* This class can't be assigned twice so it conflicts with itsself */
-    var $conflicts        = array("goSyslogServer");
+    var $conflicts        = array("rSyslogServer");
 
     var $DisplayName      = "";
     var $dn               = NULL;