Skip to content

Commit 2090a22

Browse files
Add basic ungrouped table
Signed-off-by: Adhitya Mamallan <[email protected]>
1 parent ab3b738 commit 2090a22

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,18 @@ 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)
59
import WorkflowHistoryTimelineLoadMore from '@/views/workflow-history/workflow-history-timeline-load-more/workflow-history-timeline-load-more';
610

711
import WorkflowHistoryUngroupedEvent from '../workflow-history-ungrouped-event/workflow-history-ungrouped-event';
812

13+
<<<<<<< HEAD
914
import compareUngroupedEvents from './helpers/compare-ungrouped-events';
15+
=======
16+
>>>>>>> d60602c5 (Add basic ungrouped table)
1017
import { styled } from './workflow-history-ungrouped-table.styles';
1118
import {
1219
type UngroupedEventInfo,

0 commit comments

Comments
 (0)