Module: check_mk
Branch: master
Commit: ac0fc7d53f889b8b16ff87c98842dcbba6d60351
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac0fc7d53f889b…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Jan 22 14:43:37 2013 +0100
Remove conflict from ChangeLog
---
ChangeLog | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0746ae1..44c1316 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,6 @@
Multisite:
* Added comment painter to notification related views
->>>>>>> e75f82c19d125f6599dbc63b8defc4c589f7d363
WATO:
* Added hr_mem check to the memory checkgroup to make it configurable in WATO