From f6c95cb0371a517d58bfde95e9ee685345f40c33 Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad Date: Tue, 10 Sep 2024 19:14:08 -0700 Subject: [PATCH] Resolve conflict Signed-off-by: Sayali Gaikawad --- .../resthandler/RestGetSnapshotManagementIT.kt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/resthandler/RestGetSnapshotManagementIT.kt b/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/resthandler/RestGetSnapshotManagementIT.kt index 3a0ef40c2..fead098e8 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/resthandler/RestGetSnapshotManagementIT.kt +++ b/src/test/kotlin/org/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