Resolve conflict

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
opensearch-project · Sep 11, 2024 · f2e8ad7 · f2e8ad7
1 parent 9a043b9
commit f2e8ad7
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.../opensearch/indexmanagement/snapshotmanagement/resthandler/RestGetSnapshotManagementIT.kt b/.../opensearch/indexmanagement/snapshotmanagement/resthandler/RestGetSnapshotManagementIT.kt
@@ -5,14 +5,9 @@
 
 package org.opensearch.indexmanagement.snapshotmanagement.resthandler
 
-<<<<<<< HEAD
-import org.apache.http.HttpHeaders
-import org.apache.http.message.BasicHeader
-=======
 import org.apache.hc.core5.http.HttpHeaders
 import org.apache.hc.core5.http.message.BasicHeader
 import org.opensearch.client.Request
->>>>>>> 395317dc (Update CI check for integ-test-with-security to run all integ tests with security (#1243))
 import org.opensearch.client.ResponseException
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin