fix build issue due to merge conflict

0d55111e · Chao Liu · c2b3bede · 0d55111e
Commit 0d55111e authored Mar 04, 2022 by Chao Liu
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 60 deletions

device_operation/src/device_conv2d_fwd_xdl_nhwc_kyxc_nhwk_bf16_instance.cpp ...rc/device_conv2d_fwd_xdl_nhwc_kyxc_nhwk_bf16_instance.cpp +0 -60

No files found.
--- a/device_operation/src/device_conv2d_fwd_xdl_nhwc_kyxc_nhwk_bf16_instance.cpp
+++ b/device_operation/src/device_conv2d_fwd_xdl_nhwc_kyxc_nhwk_bf16_instance.cpp