chore: fix conflicts

SigNoz · Sep 2, 2024 · eefb020 · eefb020
1 parent a454edf
commit eefb020
Showing 1 changed file with 1 addition and 13 deletions.
diff --git a/frontend/src/container/AlertHistory/Timeline/GraphWrapper/GraphWrapper.tsx b/frontend/src/container/AlertHistory/Timeline/GraphWrapper/GraphWrapper.tsx
@@ -1,15 +1,7 @@
 import '../Graph/Graph.styles.scss';
 
-<<<<<<< HEAD
-=======
-import { DAYJS_MANIPULATE_TYPES } from 'constants/global';
-import dayjs from 'dayjs';
->>>>>>> 39f4a2198 (chore: calculate start and end times from relative time and remove query params)
 import useUrlQuery from 'hooks/useUrlQuery';
-import {
-	useAlertHistoryQueryParams,
-	useGetAlertRuleDetailsTimelineGraphData,
-} from 'pages/AlertDetails/hooks';
+import { useGetAlertRuleDetailsTimelineGraphData } from 'pages/AlertDetails/hooks';
 import DataStateRenderer from 'periscope/components/DataStateRenderer/DataStateRenderer';
 
 import Graph from '../Graph/Graph';
@@ -32,12 +24,8 @@ function GraphWrapper({
 		ruleId,
 	} = useGetAlertRuleDetailsTimelineGraphData();
 
-<<<<<<< HEAD
 	// TODO(shaheer): uncomment when the API is ready for
 	// const { startTime } = useAlertHistoryQueryParams();
-=======
-	const { startTime } = useAlertHistoryQueryParams();
->>>>>>> 39f4a2198 (chore: calculate start and end times from relative time and remove query params)
 
 	// const [isVerticalGraph, setIsVerticalGraph] = useState(false);