[Mlir-commits] [mlir] 5809061 - [mlir][sparse] fix broken test (merge conflict marker was left) (#72438)

[llvmlistbot at llvm.org]

Author: Aart Bik
Date: 2023-11-15T13:01:43-08:00
New Revision: 58090617c6fe3878e4ebc6e1cb91fb1eff0801a6

URL: https://github.com/llvm/llvm-project/commit/58090617c6fe3878e4ebc6e1cb91fb1eff0801a6
DIFF: https://github.com/llvm/llvm-project/commit/58090617c6fe3878e4ebc6e1cb91fb1eff0801a6.diff

LOG: [mlir][sparse] fix broken test (merge conflict marker was left) (#72438)

Added: 
    

Modified: 
    mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir

Removed: 
    


################################################################################
diff  --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir
index de05320fbadb89f..2b9b73a1990e65f 100644
--- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir
+++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir
@@ -17,7 +17,6 @@
 // DEFINE: %{env} =
 //--------------------------------------------------------------------------------------------------
 
-<<<<<<< HEAD
 // RUN: %{compile} | %{run} | FileCheck %s
 //
 // Do the same run, but now with direct IR generation.