rm var

elastic · Mar 2, 2021 · f99ee58 · f99ee58
1 parent f33da32
commit f99ee58
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/...curity_solution/public/timelines/components/timeline/body/column_headers/header/index.tsx b/...curity_solution/public/timelines/components/timeline/body/column_headers/header/index.tsx
@@ -82,7 +82,6 @@ export const HeaderComponent: React.FC<Props> = ({
     getManageTimelineById,
     timelineId,
   ]);
-  const showSortingCapability = !isEqlOn && !(header.subType && header.subType.nested);
 
   return (
     <>
@@ -91,10 +90,7 @@ export const HeaderComponent: React.FC<Props> = ({
         isLoading={isLoading}
         isResizing={false}
         onClick={onColumnSort}
-<<<<<<< HEAD
-=======
-        showSortingCapability={showSortingCapability}
->>>>>>> 90976ee1198... [Security Solution] [Timeline] Bugfix to include unmapped fields in the timeline event details JSON (#92025)
+        showSortingCapability={!(header.subType && header.subType.nested)}
         sort={sort}
       >
         <Actions