Fixed merge conflict
[public/netxms.git] / include / nxjava.h
2017-08-05  Victor Kirhenshteinall common code for running Java parts from C++ process...