mirror of
https://github.com/urosran/cally.git
synced 2026-10-23 07:17:54 +00:00
Merge branch 'main' into dev
# Conflicts: # app/(auth)/_layout.tsx
This commit is contained in:
@@ -1,15 +1,11 @@
|
||||
import SettingsPage from "@/components/pages/settings/SettingsPage";
|
||||
import { AuthContextProvider } from "@/contexts/AuthContext";
|
||||
import { SettingsContextProvider } from "@/contexts/SettingsContext";
|
||||
import {SettingsContextProvider} from "@/contexts/SettingsContext";
|
||||
import React from "react";
|
||||
import { View } from "react-native-ui-lib";
|
||||
|
||||
export default function Screen() {
|
||||
return (
|
||||
<AuthContextProvider>
|
||||
<SettingsContextProvider>
|
||||
<SettingsPage />
|
||||
</SettingsContextProvider>
|
||||
</AuthContextProvider>
|
||||
);
|
||||
return (
|
||||
<SettingsContextProvider>
|
||||
<SettingsPage/>
|
||||
</SettingsContextProvider>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user