[checkmk-commits] solved some merge conflicts

Module: check_mk Branch: master Commit: bfcf58b5373c72edca5dcda43551719372d4346e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfcf58b5373c72… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 16 16:31:33 2016 +0100 solved some merge conflicts --- .werks/3186 | 9 +++ ChangeLog | 2 + checks/fortigate_node | 175 ++++++++++++++++++++++++++++++++----------------- 3 files changed, 125 insertions(+), 61 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bfcf58b537…