Skip to content

Commit 7e11bfe

Browse files
Change types and add helper
Signed-off-by: Adhitya Mamallan <[email protected]>
1 parent 2090a22 commit 7e11bfe

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

src/views/workflow-history-v2/workflow-history-ungrouped-table/workflow-history-ungrouped-table.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,11 @@ import { useMemo } from 'react';
22

33
import { Virtuoso } from 'react-virtuoso';
44

5-
<<<<<<< HEAD
6-
=======
7-
import compareUngroupedEvents from '@/views/workflow-history/helpers/compare-ungrouped-events';
8-
>>>>>>> d60602c5 (Add basic ungrouped table)
95
import WorkflowHistoryTimelineLoadMore from '@/views/workflow-history/workflow-history-timeline-load-more/workflow-history-timeline-load-more';
106

117
import WorkflowHistoryUngroupedEvent from '../workflow-history-ungrouped-event/workflow-history-ungrouped-event';
128

13-
<<<<<<< HEAD
149
import compareUngroupedEvents from './helpers/compare-ungrouped-events';
15-
=======
16-
>>>>>>> d60602c5 (Add basic ungrouped table)
1710
import { styled } from './workflow-history-ungrouped-table.styles';
1811
import {
1912
type UngroupedEventInfo,

0 commit comments

Comments
 (0)