From 04d9c07a3ced19d218d1e8a32e2dd17decbfdcde Mon Sep 17 00:00:00 2001
From: Kawika Avilla <kavilla414@gmail.com>
Date: Thu, 29 Aug 2024 22:36:51 +0000
Subject: [PATCH] fix conflict

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
---
 .../query_enhancements/server/search/sql_search_strategy.ts   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/plugins/query_enhancements/server/search/sql_search_strategy.ts b/src/plugins/query_enhancements/server/search/sql_search_strategy.ts
index 151381eb2c8..ffc7f0a6f0c 100644
--- a/src/plugins/query_enhancements/server/search/sql_search_strategy.ts
+++ b/src/plugins/query_enhancements/server/search/sql_search_strategy.ts
@@ -23,9 +23,6 @@ export const sqlSearchStrategyProvider = (
   client: ILegacyClusterClient,
   usage?: SearchUsage
 ): ISearchStrategy<IOpenSearchDashboardsSearchRequest, IDataFrameResponse> => {
-<<<<<<< HEAD
-  const sqlFacet = new Facet({ client, logger, endpoint: 'ppl.sqlQuery' });
-=======
   const sqlFacet = new Facet({
     client,
     logger,
@@ -33,7 +30,6 @@ export const sqlSearchStrategyProvider = (
     useJobs: false,
     shimResponse: true,
   });
->>>>>>> 9b8266f178... [discover] registered languages interceptor clean up and aggs (#7870)
 
   return {
     search: async (context, request: any, options) => {