[icinga-checkins] icinga.org: icinga-web/jmosshammer/principal: resolving merge

git at icinga.org git at icinga.org
Thu Apr 29 12:54:02 CEST 2010


Module: icinga-web
Branch: jmosshammer/principal
Commit: 485d7ca27528a9e0a08221f9b4d16c000debd5f3
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=485d7ca27528a9e0a08221f9b4d16c000debd5f3

Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Thu Apr 29 12:45:17 2010 +0200

resolving merge

---

 lib/icingaScheduler/res/storage.dat |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/lib/icingaScheduler/res/storage.dat b/lib/icingaScheduler/res/storage.dat
index e69de29..bc4fe0f 100755
--- a/lib/icingaScheduler/res/storage.dat
+++ b/lib/icingaScheduler/res/storage.dat
@@ -0,0 +1,4 @@
+<<<<<<< jmosshammer/principal:lib/icingaScheduler/res/storage.dat
+=======
+a:8:{s:7:"Heatmap";a:2:{s:8:"lastExec";i:1272537662;s:6:"result";b:1;}s:10:"testtest_0";a:2:{s:8:"lastExec";i:1271420282;s:6:"result";b:1;}s:10:"testtest_1";a:2:{s:8:"lastExec";i:1271420285;s:6:"result";b:1;}s:9:"default_0";a:2:{s:8:"lastExec";i:1272537662;s:6:"result";b:1;}s:9:"Default_1";a:2:{s:8:"lastExec";i:1272537664;s:6:"result";b:1;}s:10:"testtest_2";a:2:{s:8:"lastExec";i:1272383467;s:6:"result";b:1;}s:14:"gdssdgsdgsdg_3";a:2:{s:8:"lastExec";i:1272383471;s:6:"result";b:1;}s:9:"default_4";a:2:{s:8:"lastExec";i:1272383474;s:6:"result";b:1;}}
+>>>>>>> local:lib/icingaScheduler/res/storage.dat





More information about the icinga-checkins mailing list