reolve merge conflict

Signed-off-by: Riya Saxena <[email protected]>
riysaxen-amzn · Mar 25, 2024 · 6ff90ff · 6ff90ff
1 parent 29ee558
commit 6ff90ff
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/DocumentMonitorRunnerIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/DocumentMonitorRunnerIT.kt
@@ -2020,7 +2020,6 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
         }
     }
 
->>>>>>> ba84d04d ( Findings API Enhancements changes and integ tests fix (#1464))
     @Suppress("UNCHECKED_CAST")
     /** helper that returns a field in a json map whose values are all json objects */
     private fun Map<String, Any>.objectMap(key: String): Map<String, Map<String, Any>> {