fix: merge conflict resolve

DDD-Community · Jan 13, 2024 · 11ccbd8 · 11ccbd8
1 parent b09e384
commit 11ccbd8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10,919 deletions.
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -1,19 +1,15 @@
 import AppleIconSvg from '../assets/icons/Frame 35.svg';
 import { AppleIcon } from '@/components/atoms/icons/FoodIcons';
-import { Inter } from 'next/font/google';
+import { type NextPage } from 'next';
 
-const inter = Inter({ subsets: ['latin'] });
-
-export default function Home(): JSX.Element {
+const Home: NextPage = () => {
   return (
-    <main
-      className={`flex min-h-screen flex-col items-center justify-between p-24 ${inter.className}`}
-    >
-      <div className="mb-32 grid text-center lg:max-w-5xl lg:w-full lg:mb-0 lg:grid-cols-4 lg:text-left">
-        mara web
-        <AppleIconSvg />
-        <AppleIcon />
-      </div>
+    <main className={`flex min-h-screen justify-center items-center p-24 `}>
+      <div className="heading1-bold text-primary2">mara</div>
+      <p className="body2-semibold text-point1">web</p>
+      <AppleIconSvg />
+      <AppleIcon />
     </main>
   );
-}
+};
+export default Home;