Skip to content

Commit

Permalink
fixes merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
dplumlee committed Aug 9, 2021
1 parent 3fa23bb commit c3f634b
Showing 1 changed file with 0 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,6 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
defaultModel={defaultTimelineModel}
end={to}
currentFilter={filterGroup}
headerFilterGroup={headerFilterGroup}
id={timelineId}
onRuleChange={onRuleChange}
renderCellValue={RenderCellValue}
Expand Down

0 comments on commit c3f634b

Please sign in to comment.