- resolved conflict: useSourcererDataView vs useSourcererScope

elastic · Nov 15, 2021 · 54a83b8 · 54a83b8
1 parent 307518b
commit 54a83b8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.../plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx b/.../plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx
@@ -182,12 +182,8 @@ export const EqlTabContentComponent: React.FC<Props> = ({
     docValueFields,
     loading: loadingSourcerer,
     selectedPatterns,
-<<<<<<< HEAD
   } = useSourcererScope(SourcererScopeName.timeline);
-=======
-  } = useSourcererDataView(SourcererScopeName.timeline);
   const ACTION_BUTTON_COUNT = 5;
->>>>>>> e4814b91cac ([Security Solution] Adjusts the width of the `Actions` column and action icon buttons (#118454))
 
   const isBlankTimeline: boolean = isEmpty(eqlQuery);