- resolving merge conflicts

elastic · Aug 3, 2021 · cf5a46a · cf5a46a
1 parent 239d43e
commit cf5a46a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
@@ -68,12 +68,11 @@ interface OwnProps {
   data: TimelineItem[];
   id: string;
   isEventViewer?: boolean;
-  leadingControlColumns: ControlColumnProps[];
-  loadPage: (newActivePage: number) => void;
   renderCellValue: (props: CellValueElementProps) => React.ReactNode;
   rowRenderers: RowRenderer[];
   tabType: TimelineTabs;
   leadingControlColumns?: ControlColumnProps[];
+  loadPage: (newActivePage: number) => void;
   trailingControlColumns?: ControlColumnProps[];
   totalPages: number;
   totalItems: number;