w

Author: ericsngyun

www/src/pages/components/LandingPage.tsx

@@ -120,14 +120,7 @@ export default function LandingPage():any {
         <FeaturesSection />
         <TeamSection />
       </div>
-
-
-<<<<<<< HEAD
-      </main>``
-=======
-      </main>
->>>>>>> b0762547e2888aed98ea28a1845973415410bdf6
-
+    </main>
       {/* Footer section */}
       <footer className="mt-8 bg-[#333333] gray-900 sm:mt-8">
         <div className="mx-auto max-w-md overflow-hidden py-3 pb-10 px-4 sm:max-w-3xl sm:px-6 lg:max-w-7xl lg:px-8">

www/src/pages/components/NavBar.tsx

@@ -31,11 +31,8 @@ function NavBarSytling() {
 
 
   return (
-<<<<<<< HEAD
+
     <Disclosure as="nav" className="bg-[#333333] fixed z-10 w-screen drop-shadow-20px">
-=======
-    <Disclosure as="nav" className={NavBarSytling()}>
->>>>>>> b0762547e2888aed98ea28a1845973415410bdf6
       {({ open }) => (
         <>
           <div className="mx-auto max-w9xl px-4 sm:px-6 lg:px-8">

www/src/pages/index.tsx

@@ -12,13 +12,7 @@ const Home: NextPage = () => {
 
   return (
     <>
-<<<<<<< HEAD
-      {/* <FeatureSlider/>                     */}
-=======
-
->>>>>>> b0762547e2888aed98ea28a1845973415410bdf6
       <NavBar />
-
       <LandingPage />
       {/* <FeatureSlider/> */}
       {/* <Blogs /> */}