From 6ff90ffae92d9193670e16fe0ce74362d70e8087 Mon Sep 17 00:00:00 2001
From: Riya Saxena <riysaxen@amazon.com>
Date: Mon, 25 Mar 2024 16:57:13 -0700
Subject: [PATCH] reolve merge conflict

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
---
 .../kotlin/org/opensearch/alerting/DocumentMonitorRunnerIT.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/DocumentMonitorRunnerIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/DocumentMonitorRunnerIT.kt
index 5bbce4255..a8addbfac 100644
--- 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>> {