From 81d791dd175324b65b20833c8f33da45f60f4e73 Mon Sep 17 00:00:00 2001 From: Dejan Date: Sun, 29 Dec 2024 19:06:38 +0100 Subject: [PATCH] - Fixed merge conflicts --- components/pages/calendar/DetailedCalendar.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/components/pages/calendar/DetailedCalendar.tsx b/components/pages/calendar/DetailedCalendar.tsx index f9c58ac..012ba4a 100644 --- a/components/pages/calendar/DetailedCalendar.tsx +++ b/components/pages/calendar/DetailedCalendar.tsx @@ -12,7 +12,6 @@ import {isToday} from "date-fns"; import { View } from "react-native-ui-lib"; import { DeviceType } from "expo-device"; import * as Device from "expo-device" -import {View} from "react-native-ui-lib"; import {useAtomCallback} from 'jotai/utils' interface EventCalendarProps {