Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
seoye0ng committed Jan 6, 2024
1 parent 655b306 commit a8f1967
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import Link from 'next/link';

import BottomNav from '@/components/shared/bottom-nav/BottomNav';

export default function Home() {
return (
<div>
<h1 style={{ fontSize: '20px' }}>Home</h1>
<h1>Home</h1>
<Link href="/about">About</Link>
<BottomNav />
</div>
Expand Down

0 comments on commit a8f1967

Please sign in to comment.