[checkmk-commits] [tribe29/checkmk] 4f6c06: fixed rebase errors

Branch: refs/heads/1.6.0 Home: https://github.com/tribe29/checkmk Commit: 4f6c060eacaa0756c1673d859d6cef270f0d79df https://github.com/tribe29/checkmk/commit/4f6c060eacaa0756c1673d859d6cef270… Author: Sergey Kipnis <sergey.kipnis(a)tribe29.com> Date: 2019-09-25 (Wed, 25 Sep 2019) Changed paths: M agents/wnx/src/engine/service_processor.h M agents/wnx/watest/test-service-processor.cpp Log Message: ----------- fixed rebase errors Change-Id: I37f4908dba1f280327b08ecc6a7d0766d0f2baca