Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/an/new_deconv_slt' into an/new_d…
Browse files Browse the repository at this point in the history
…econv_slt

# Conflicts:
#	src/plugins/intel_cpu/src/plugin.cpp
#	src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/convolution_backprop_data.cpp
#	src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/convolution_backprop_data.hpp
#	src/plugins/intel_cpu/tests/functional/single_layer_tests/instances/arm/convolution_backprop_data.cpp
#	src/plugins/intel_cpu/tests/functional/single_layer_tests/instances/common/convolution_backprop_data.cpp
#	src/plugins/intel_cpu/tests/functional/single_layer_tests/instances/x64/convolution_backprop_data.cpp
  • Loading branch information
allnes committed Dec 14, 2023
2 parents 23c1ca9 + 82c00ff commit 41385a1
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 41385a1

Please sign in to comment.