conflict resolved

Author: devvsakib

src/components/Header/Header.jsx

@@ -3,11 +3,7 @@ import { Link } from "react-router-dom";
 
 function Header({ notice }) {
   return (
-<<<<<<< HEAD
-    <header className="p-4 bg-dark-secondary">
-=======
     <header className="p-4 bg-dark-secondary sticky top-0 z-50">
->>>>>>> ab6ff739206088a7a085920c9ef786c354271d4d
       <div className="w-full md:w-5/6 mx-auto flex flex-col md:flex-row justify-between items-center">
         {/* <h1 className="text-xl font-bold">
           GITHUB <span className="text-primary line-through">ERROR</span> SOLVE

src/components/Layout/Layout.jsx

@@ -12,13 +12,9 @@ const Layout = ({children}) => {
           <Header 
               notice={"Under Construction"}
           />
-<<<<<<< HEAD
-          {children}
-=======
           <div className='relative'>
               {children}
           </div>
->>>>>>> ab6ff739206088a7a085920c9ef786c354271d4d
         </>
     );
 };