Merge pull request #17374 from alalek:dnn_fix_build

author Alexander Alekhin <alexander.a.alekhin@gmail.com>

Mon, 25 May 2020 18:46:14 +0000 (18:46 +0000)

committer Alexander Alekhin <alexander.a.alekhin@gmail.com>

Mon, 25 May 2020 18:46:15 +0000 (18:46 +0000)
author Alexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 25 May 2020 18:46:14 +0000 (18:46 +0000)
committer Alexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 25 May 2020 18:46:15 +0000 (18:46 +0000)
diff --cc modules/dnn/src/layers/convolution_layer.cpp
Simple merge
author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Mon, 25 May 2020 18:46:14 +0000 (18:46 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Mon, 25 May 2020 18:46:15 +0000 (18:46 +0000)