resolve conflict

varianter · Sep 27, 2024 · b1e8036 · b1e8036
1 parent f4ab0b9
commit b1e8036
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
@@ -4,7 +4,7 @@ import "../src/styles/global.css";
 import localFont from "next/font/local";
 
 const fontBrittiSans = localFont({
-  src: "../../public/fonts/britti-sans-variable.woff2",
+  src: "../../public/_assets/britti-sans-variable.woff2",
   variable: "--font-britti-sans",
 });
 

diff --git a/public/fonts/britti-sans-variable.woff2 → public/_assets/britti-sans-variable.woff2 b/public/fonts/britti-sans-variable.woff2 → public/_assets/britti-sans-variable.woff2
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -10,21 +10,9 @@ import { loadStudioQuery } from "studio/lib/store";
 
 import "src/styles/global.css";
 
-<<<<<<< HEAD
 const fontBrittiSans = localFont({
   src: "../../public/_assets/fonts/britti-sans-variable.woff2",
   variable: "--font-britti-sans",
-=======
-const fontRecoleta = localFont({
-  src: "../../public/_assets/recoleta.otf",
-  variable: "--font-recoleta",
-});
-
-const fontFigtree = Figtree({
-  subsets: ["latin"],
-  weight: "400",
-  variable: "--font-figtree",
->>>>>>> v3
 });
 
 export async function generateMetadata(): Promise<Metadata> {
@@ -50,7 +38,7 @@ export default async function RootLayout({
   }
   return (
     <html lang={siteLang}>
-      <body className={`${fontBrittiSans.variable}`}>
+      <body className={fontBrittiSans.variable}>
         {children}
         {draftMode().isEnabled && <LiveVisualEditing />}
       </body>