Fixed merge conflict
authorEriks Jenkevics <eriks@netxms.org>
Thu, 23 Nov 2017 15:51:56 +0000 (17:51 +0200)
committerEriks Jenkevics <eriks@netxms.org>
Thu, 23 Nov 2017 15:52:07 +0000 (17:52 +0200)
commit7632126db998175267f3a19f94bd086dbbafce83
tree1a8f7005bbc31236338cab29b0dc41ce0202d576
parent1a583c3219dd60ee756181f3c93067672cab87dc
Fixed merge conflict
src/server/tools/nxdbmgr/upgrade_v30.cpp