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

[Aart Bik]

https://github.com/aartbik created https://github.com/llvm/llvm-project/pull/72438

None

>From 8c51a66dd19f9d1ddb6ef3a390cf888e58923780 Mon Sep 17 00:00:00 2001
From: Aart Bik <ajcbik at google.com>
Date: Wed, 15 Nov 2023 12:53:45 -0800
Subject: [PATCH] [mlir][sparse] fix broken test (merge conflict marker was
 left)

---
 mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir | 1 -
 1 file changed, 1 deletion(-)

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.