[checkmk-commits] Check_MK Git: check_mk: manually resolved merge conflict in ChangeLog