compress force merge

Baunsgaard · Sep 24, 2024 · 92c1382 · 92c1382
1 parent 7d55aca
commit 92c1382
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/src/test/java/org/apache/sysds/test/functions/compress/configuration/CompressForce.java b/src/test/java/org/apache/sysds/test/functions/compress/configuration/CompressForce.java
@@ -84,11 +84,7 @@ public void testSequence_CP() {
 
 	@Test
 	public void testSequence_SP() {
-<<<<<<< HEAD
 		runTest(1500, 1, -1, 1, ExecType.SPARK, "plus_mm_ewbm_sum");
-=======
-		runTest(1500, 1, 2, 1, ExecType.SPARK, "plus_mm_ewbm_sum");
->>>>>>> cb91b16977 ([DO NOT MERGE] JAVA 17 BWARE COMMIT)
 	}
 
 	@Test
@@ -108,11 +104,7 @@ public void test_ElementWiseBinaryMultiplyOp_right_CP() {
 
 	@Test
 	public void test_ElementWiseBinaryMultiplyOp_right_SP() {
-<<<<<<< HEAD
 		runTest(1500, 1, -1, 1, ExecType.SPARK, "ewbm_right");
-=======
-		runTest(1500, 1, 2, 1, ExecType.SPARK, "ewbm_right");
->>>>>>> cb91b16977 ([DO NOT MERGE] JAVA 17 BWARE COMMIT)
 	}
 
 	@Test