Fixed merge mistakes
authorzev <zev@netxms.org>
Thu, 21 Sep 2017 06:48:10 +0000 (09:48 +0300)
committerzev <zev@netxms.org>
Thu, 21 Sep 2017 06:48:10 +0000 (09:48 +0300)
commitb8d12b0350cf244da3fdab175e69a032663cbd78
tree888505e3057c5b156b7bfb549351a40c555a03a5
parent91b3cba932513648fd1aed66f605ed69e4b0a300
Fixed merge mistakes
include/netxmsdb.h
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/PollingTarget.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/PollingTarget.java with 100% similarity]
src/server/tools/nxdbmgr/upgrade.cpp