resolve conflict

Signed-off-by: Jackie Han <jkhanjob@gmail.com>
opensearch-project · Sep 3, 2024 · 32ac56b · 32ac56b
1 parent 3ebc42d
commit 32ac56b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java b/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java
@@ -994,7 +994,6 @@ public void testNullFixedValue() throws IOException {
                 null,
                 null,
                 null,
-                null,
                 null
             )
         );