fix: resolve merge conflict in globals.css

2026-04-14 23:43:14 +07:00
parent 13a281b8c8
commit a7356cdb7a
29 changed files with 23 additions and 9797 deletions
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,5 +1,4 @@
 import type { Metadata } from "next";
-import "./globals.css";

 import Header from "./components/layout/Header/Header";
 import Footer from "./components/layout/Footer/Footer";
@@ -12,6 +11,7 @@ export const metadata: Metadata = {
  title: "H.A.I Learning",
  description: "H.A.I Learning",
 };
+import "./globals.css";

 export default function RootLayout({
  children,