Merge pull request intel#1506 from myler/CMPLRTST-19210

CMPLRTST-19210: fix version control conflict

Author: myler

SYCL/Matrix/element_wise_all_ops_int8_packed.cpp

@@ -11,18 +11,11 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
-<<<<<<< HEAD
 // This test stores the matrix B that is VNNIed (packed) in a row major fashion.
 // This is expected to fail on the GPU because the implementation does not
 // support automatic transformation YET, in this case: VNNI to row major in the
 // store.
 
-=======
-// This test store the matrix B that is VNNIed (packed) in a row major fashion.
-// This is expected to fail on the GPU because the implementation does not
-// support automatic transformation YET, in this case: VNNI to row major in the
-// store.
->>>>>>> 909dc769e (Set the row major store on B test to xfail on the GPU (#1392))
 // XFAIL: gpu
 
 #include <iostream>