solve conflicts

GDSC-RCCIIT · Oct 30, 2024 · da84114 · da84114
1 parent 39fb8fd
commit da84114
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 274 deletions.
diff --git a/src/app/page.js b/src/app/page.js
@@ -7,8 +7,6 @@ export default function Home() {
   return (
     <>
     <Hero />
-    <Homepage/>
-
     </>
   );
 }