Fix bad merge

bbimber · web-flow · commit 0f65f56c6406 · 2023-08-31T17:05:11.000-07:00
diff --git a/cluster/src/org/labkey/cluster/pipeline/TestCase.java b/cluster/src/org/labkey/cluster/pipeline/TestCase.java
@@ -106,11 +106,7 @@ public void basicTest() throws Exception
             _log.info("testing engine: " + engine.getType());
             if (engine instanceof AbstractClusterExecutionEngine<?> acee)
             {
-<<<<<<< HEAD
                 runTestJob(c, TestContext.get().getUser(), acee);
-=======
-                runTestJob(c, TestContext.get().getUser(), (AbstractClusterExecutionEngine<?>) engine);
->>>>>>> origin/discvr-23.7
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,7 @@ public void basicTest() throws Exception`
`106`	`106`	`_log.info("testing engine: " + engine.getType());`
`107`	`107`	`if (engine instanceof AbstractClusterExecutionEngine<?> acee)`
`108`	`108`	`{`
`109`		`-<<<<<<< HEAD`
`110`	`109`	`runTestJob(c, TestContext.get().getUser(), acee);`
`111`		`-=======`
`112`		`- runTestJob(c, TestContext.get().getUser(), (AbstractClusterExecutionEngine<?>) engine);`
`113`		`->>>>>>> origin/discvr-23.7`
`114`	`110`	`}`
`115`	`111`	`}`
`116`	`112`	`}`