Fixed merge conflict
authorzev <zev@netxms.org>
Thu, 17 Aug 2017 14:27:17 +0000 (17:27 +0300)
committerzev <zev@netxms.org>
Thu, 17 Aug 2017 14:27:17 +0000 (17:27 +0300)
commit1c6a6656783c25d1d38aaca7382a8488c91af2bc
tree207738f71175b180c07134c86435741a4ae011cd
parent8ad8cbe8634e99ab19864732c7bd5761d763bdea
Fixed merge conflict
include/nms_agent.h