Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

fix: merge issues

bautistaaad0ca1b65a3e0
diff --git a/apps/web/src/components/Navigation/index.tsx b/apps/web/src/components/Navigation/index.tsx
index ead1efd9..8cf88328 100644
--- a/apps/web/src/components/Navigation/index.tsx
+++ b/apps/web/src/components/Navigation/index.tsx
@@ -48,13 +48,6 @@ export async function Navigation() {
<>
<NavLink title="Explore" href="/explore" />
<NavLink title="Tracks" href="/tracks" />
-<<<<<<< Updated upstream
- {featureFlags?.enableHolidayEvent ? (
- <div className="flex items-center gap-1">
- <NavLink title="Advent of TS" href="https://www.adventofts.com" />
- </div>
- ) : null}
-=======
<div className="flex items-center gap-1">
<a
className="text-foreground/80"
@@ -68,7 +61,6 @@ export async function Navigation() {
New
</Badge>
</div>
->>>>>>> Stashed changes
</>
);