From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Fri, 18 Oct 2013 08:49:59 -0400 Subject: [PATCH] Resolved differences from svn merge to trunk and git master --- server/mods-available/rescue_core_module.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/mods-available/rescue_core_module.inc.php b/server/mods-available/rescue_core_module.inc.php index 49012d5..d3d3621 100644 --- a/server/mods-available/rescue_core_module.inc.php +++ b/server/mods-available/rescue_core_module.inc.php @@ -35,7 +35,7 @@ /* No actions at this time. maybe later... */ var $actions_available = array(); /** - * The monitoring-Data of this module. + * The monitoring-Data of this module. * [0] are the actual data, [1] are the data 1 minnute ago [2] are teh data 2 minuntes... */ private $_monitoringData = array(); -- Gitblit v1.9.1