Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/hailearning.edu.vn into fix/bao-03022026-Page-Service-Service-Detail

app/layout.tsx

@@ -1,6 +1,10 @@
 import type { Metadata } from "next";
 import "./globals.css";
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 64845c60b32397ad46cc4109974ab616fe186836
 // import Header from "./components/Header";
 // import Footer from "./components/Footer";
 import Loader from "./components/Loader";
@@ -48,9 +52,9 @@ export default function RootLayout({
         <BackToTop />
         <MouseCursor />
         {/* <Header /> */}
-
+        
         {children}
-
+        
         {/* <Footer /> */}
 
         {/* Scripts */}