remove non-existing import fro cluster settings

Signed-off-by: Kaushal Kumar <[email protected]>
opensearch-project · May 14, 2024 · ff4629c · ff4629c
1 parent 89f2694
commit ff4629c
Showing 1 changed file with 0 additions and 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
@@ -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;