fix: conflict

This commit is contained in:
Aslam H
2024-09-23 23:28:04 +07:00
46 changed files with 972 additions and 755 deletions

View File

@@ -3,7 +3,7 @@ import { Sidebar } from "@/components/custom/sidebar/sidebar"
import { CommandPalette } from "@/components/custom/command-palette/command-palette"
import { LearnAnythingOnboarding } from "@/components/custom/learn-anything-onboarding"
import { Shortcut } from "@/components/custom/Shortcut/shortcut"
import { GlobalKeydownHandler } from "@/components/custom/global-keydown-handler"
import { GlobalKeyboardHandler } from "@/components/custom/global-keyboard-handler"
export const viewport: Viewport = {
width: "device-width, shrink-to-fit=no",
@@ -16,8 +16,7 @@ export default function PageLayout({ children }: { children: React.ReactNode })
<div className="flex h-full min-h-full w-full flex-row items-stretch overflow-hidden">
<Sidebar />
<LearnAnythingOnboarding />
<GlobalKeydownHandler />
<GlobalKeyboardHandler />
<CommandPalette />
<Shortcut />