fix: merge conflicts

amanbairagi30 · amanbairagi30 · commit 69bbbf4497de · 2025-02-15T10:52:30.000+05:30
diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx
@@ -1,18 +1,20 @@
 import type { Metadata } from "next";
-import { Figtree, Instrument_Serif, Manrope } from "next/font/google";
+import { Instrument_Serif, Manrope } from "next/font/google";
 import "./globals.css";
 import { Appbar } from "@/components/Appbar";
 import { Providers } from "@/components/providers/Providers";
-import { Footer } from "@/components/Footer";
+import Footer from "@/components/landing/footer";
 
-const geistSans = localFont({
-  src: "./fonts/GeistVF.woff",
-  variable: "--font-geist-sans",
+const manrope = Manrope({
+  subsets: ["latin"],
+  variable: "--font-manrope",
+  weight: ["300", "400", "500", "600", "700"],
 });
 
-const geistMono = localFont({
-  src: "./fonts/GeistMonoVF.woff",
-  variable: "--font-geist-mono",
+const instrumental_serif = Instrument_Serif({
+  subsets: ["latin"],
+  variable: "--font-instrumental-serif",
+  weight: ["400"],
 });
 
 export const metadata: Metadata = {
@@ -36,7 +38,7 @@ export default function RootLayout({
         />
       </head>
       <body
-        className={`${geistSans.variable} ${geistMono.variable} min-h-screen bg-background font-sans antialiased`}
+        className={`${manrope.variable} ${instrumental_serif.variable} min-h-screen bg-background font-sans antialiased`}
       >
         <Providers>
           <div className="relative flex min-h-screen flex-col">
diff --git a/apps/web/app/page.tsx b/apps/web/app/page.tsx
@@ -9,7 +9,6 @@ export default function Home() {
       <Hero />
       <Features />
       <FAQ />
-      <Footer />
     </div>
   );
 }
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -41,7 +41,8 @@
     "react-hot-toast": "^2.5.1",
     "tailwind-merge": "^3.0.1",
     "tailwindcss": "^4.0.6",
-    "tailwindcss-animate": "^1.0.7"
+    "tailwindcss-animate": "^1.0.7",
+    "motion": "^12.4.2"
   },
   "devDependencies": {
     "@repo/eslint-config": "*",
diff --git a/package.json b/package.json
@@ -19,11 +19,5 @@
   "workspaces": [
     "apps/*",
     "packages/*"
-  ],
-  "dependencies": {
-    "@phosphor-icons/react": "^2.1.7",
-    "embla-carousel-autoplay": "^8.5.2",
-    "motion": "^12.4.2",
-    "next-themes": "^0.4.4"
-  }
+  ]
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ export default function Home() {`
`9`	`9`	`<Hero />`
`10`	`10`	`<Features />`
`11`	`11`	`<FAQ />`
`12`		`- <Footer />`
`13`	`12`	`</div>`
`14`	`13`	`);`
`15`	`14`	`}`