Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
feature(COR-1953): Fixed merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
VWSCoronaDashboard30 committed Mar 20, 2024
2 parents 9d43714 + 2de4457 commit 6cc801f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/app/src/domain/sewer/sewer-chart/sewer-chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ChartTile } from '~/components/chart-tile';
import { ChartTimeControls } from '~/components/chart-time-controls';
import { colors, NlSewer, SewerPerInstallationData, TimeframeOption, TimeframeOptionsList } from '@corona-dashboard/common';
import { DateRange } from '~/components/metadata';
import { getDateFromValues } from '~/utils/get-last-insertion-date-of-page';
import { isPresent } from 'ts-is-present';
import { mediaQueries, space } from '~/style/theme';
import { mergeData, useSewerStationSelectPropsSimplified } from './logic';
Expand All @@ -19,7 +20,6 @@ import { useValuesInTimeframe } from '~/components/time-series-chart/logic';
import { Warning } from '@corona-dashboard/icons';
import { WarningTile } from '~/components/warning-tile';
import styled from 'styled-components';
import { getDateFromValues } from '~/utils/get-last-insertion-date-of-page';

interface SewerChartProps {
/**
Expand Down

0 comments on commit 6cc801f

Please sign in to comment.