fix conflict

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
kavilla · Aug 29, 2024 · 04d9c07 · 04d9c07
1 parent c43c6da
commit 04d9c07
Showing 1 changed file with 0 additions and 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
@@ -23,17 +23,13 @@ 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,
     endpoint: 'enhancements.sqlQuery',
     useJobs: false,
     shimResponse: true,
   });
->>>>>>> 9b8266f178... [discover] registered languages interceptor clean up and aggs (#7870)
 
   return {
     search: async (context, request: any, options) => {