fix: merge properly

alexfertel · Aug 29, 2024 · 5fdd460 · 5fdd460
1 parent eda3cd7
commit 5fdd460
Showing 1 changed file with 1 addition and 19 deletions.
diff --git a/docs/src/app/layout.tsx b/docs/src/app/layout.tsx
@@ -1,27 +1,15 @@
 import type { Metadata } from "next";
-<<<<<<< HEAD
-=======
-import { Inter } from "next/font/google";
->>>>>>> main
 import { Analytics } from "@vercel/analytics/react";
 import { SpeedInsights } from "@vercel/speed-insights/next";
-import { body, mono } from "./fonts";
+import { mono } from "./fonts";
 import "./globals.css";
 
-<<<<<<< HEAD
 export const metadata: Metadata = {
   title: "bulloak - Test Generator using Branching Tree Technique",
   description:
     "bulloak is a powerful test generator that implements the Branching Tree Technique (BTT) for comprehensive smart contract testing.",
   keywords:
     "bulloak, Solidity, test generator, Branching Tree Technique, BTT, smart contracts, Ethereum",
-=======
-
-export const metadata: Metadata = {
-  title: "bulloak - Test Generator using Branching Tree Technique",
-  description: "bulloak is a powerful test generator that implements the Branching Tree Technique (BTT) for comprehensive smart contract testing.",
-  keywords: "bulloak, Solidity, test generator, Branching Tree Technique, BTT, smart contracts, Ethereum",
->>>>>>> main
 };
 
 export default function RootLayout({
@@ -31,18 +19,12 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="en">
-<<<<<<< HEAD
       <body className={`${mono.className} antialiased touch-manipulation`}>
         {children}
 
         <Analytics />
         <SpeedInsights />
       </body>
-=======
-      <body 
-        className={`${mono.className} antialiased touch-manipulation`}
-      >{children}</body>
->>>>>>> main
     </html>
   );
 }