Fixed merge conflict
[public/netxms.git] / include / nxcrypto.h
2016-11-30  Victor Kirhenshteinunfinished changes to allow use of native crypto librar...