Fix merge conflict

ROCm · Jun 6, 2024 · bca3bd2 · bca3bd2
1 parent 5099063
commit bca3bd2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/third_party/xla/xla/service/gpu/tests/gemm_rewrite_test.cc b/third_party/xla/xla/service/gpu/tests/gemm_rewrite_test.cc
@@ -240,12 +240,8 @@ ENTRY bf16gemm {
 }
   )";
 
-<<<<<<< HEAD
   if (IsCuda() &&
       HasCudaComputeCapability(se::CudaComputeCapability::Hopper())) {
-=======
-  if (HasCudaComputeCapability(se::CudaComputeCapability::Hopper())) {
->>>>>>> 306833457d32dd27a198ec8f6839b4966f941d4d
     // The Hopper optimized HLO has a BF16 multiply instruction since Hopper has
     // native BF16 multiply support.
     MatchOptimizedHlo(hlo_text, R"(