From ff4629cf41dd008f0fe6c7818c465adc2d5b6a5d Mon Sep 17 00:00:00 2001 From: Kaushal Kumar Date: Tue, 14 May 2024 11:43:08 -0700 Subject: [PATCH] remove non-existing import fro cluster settings Signed-off-by: Kaushal Kumar --- .../java/org/opensearch/common/settings/ClusterSettings.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java b/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java index 93016d2f2aaa5..4a5a45eb1a17a 100644 --- a/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java +++ b/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java @@ -156,10 +156,6 @@ import org.opensearch.search.backpressure.settings.SearchShardTaskSettings; import org.opensearch.search.backpressure.settings.SearchTaskSettings; import org.opensearch.search.fetch.subphase.highlight.FastVectorHighlighter; -<<<<<<< HEAD -======= -import org.opensearch.search.resource_limit_group.ResourceLimitGroupServiceSettings; ->>>>>>> ba237c14d3f (add resourceLimitGroupTests) import org.opensearch.snapshots.InternalSnapshotsInfoService; import org.opensearch.snapshots.SnapshotsService; import org.opensearch.tasks.TaskCancellationMonitoringSettings;