Fix missed conflict.

nod-ai · Jun 1, 2024 · 5412f6c · 5412f6c
1 parent b5a7e6b
commit 5412f6c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/compiler/src/iree/compiler/Codegen/Dialect/GPU/TargetUtils/KnownTargets.cpp b/compiler/src/iree/compiler/Codegen/Dialect/GPU/TargetUtils/KnownTargets.cpp
@@ -214,11 +214,7 @@ std::optional<TargetDetails> getAMDGPUTargetDetails(StringRef target) {
       // https://www.techpowerup.com/gpu-specs/radeon-rx-7700-xt.c3911
       .Case("rx7700xt", TargetDetails{rdna3Wgp, &rx7700xtChip})
       .Cases("rdna3", "gfx1100", "gfx1101", "gfx1102", "gfx1103", "gfx1150",
-<<<<<<< HEAD
              "gfx1151", TargetDetails{rdna3Wgp, nullptr})
-=======
-             TargetDetails{rdna3Wgp, nullptr})
->>>>>>> 1b9a088dd9 (Add gfx1150 support.)
       .Default(std::nullopt);
 }