Skip to content

V
VCCI-News
Commit 53828441 authored by Phạm Quang Bảo's avatar Phạm Quang Bảo
Browse files
Options

fix/conflic

parent 748177e8
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 15 deletions
src/app/(main)/layout.tsx deleted 100644 → 0
View file @ 748177e8
import type { Metadata } from "next";
import React from "react";
export const metadata: Metadata = {
title: "Create Next App",
description: "Generated by create next app",
};
export default function RootLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
return <main className="w-full">{children}</main>;
}
src/app/layout.tsx
View file @ 53828441
......@@ -5,6 +5,16 @@ import { Providers } from "./_providers";
import React from "react";
import Header from "@/components/ui/layout/header";
const geistSans = Geist({
variable: "--font-geist-sans",
subsets: ["latin"],
});
const geistMono = Geist_Mono({
variable: "--font-geist-mono",
subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Create Next App",
description: "Generated by create next app",
......@@ -18,6 +28,7 @@ export default function RootLayout({
return (
<html lang="en">
<body
className={`${geistSans.variable} ${geistMono.variable} antialiased`}
>
<Providers>
<Header />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment