fix: resolve merge conflicts in SidebarWrap component

This commit is contained in:
Pablo Lara
2024-07-12 11:56:46 +02:00
2 changed files with 4 additions and 6 deletions
+2 -4
View File
@@ -42,12 +42,10 @@ export default function RootLayout({
fontSans.variable,
)}
>
<Providers themeProps={{ attribute: "class", defaultTheme: "light" }}>
<Providers themeProps={{ attribute: "class", defaultTheme: "dark" }}>
<div className="flex items-center h-dvh w-full justify-center overflow-hidden">
<SidebarWrap />
<main className="h-full w-full flex-1 flex-col p-4 overflow-y-scroll">
{children}
</main>
<main className="w-full flex-1 flex-col p-4">{children}</main>
</div>
</Providers>
</body>
+2 -2
View File
@@ -1,3 +1,3 @@
Django==5.0.6
djangorestframework==3.15.1
Django==5.0.7
djangorestframework==3.15.2
django-cors-headers==4.3.1