fix merge conflict

getsentry · Aug 19, 2024 · fb0315d · fb0315d
1 parent 9fefba3
commit fb0315d
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/src/components/header.tsx b/src/components/header.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import {useEffect, useState} from 'react';
+import {Fragment, useEffect, useState} from 'react';
 import {HamburgerMenuIcon} from '@radix-ui/react-icons';
 import Image from 'next/image';
 import Link from 'next/link';
@@ -102,23 +102,19 @@ export function Header({pathname, searchPlatforms, noSearch}: Props) {
         <div className="hidden lg:flex justify-end flex-1 space-x-2 items-center">
           <NavLink href="https://sentry.io/changelog/">Changelog</NavLink>
           <NavLink href="https://try.sentry-demo.com/demo/start/">Sandbox</NavLink>
-<<<<<<< Updated upstream
-          <NavLink href="https://sentry.io/">Sign In</NavLink>
-          <NavLink
-            href="https://sentry.io/signup/"
-            className="transition-all duration-300 ease-in-out hover:bg-gradient-to-r hover:from-[#fa7faa] hover:via-[#ff9691] hover:to-[#ffb287]"
-          >
-            Get Started
-          </NavLink>
-||||||| Stash base
-          <NavLink href="https://sentry.io/">Sign In</NavLink>
-=======
           {user ? (
             <Avatar user={user} />
           ) : (
-            <NavLink href="https://sentry.io/">Sign In</NavLink>
+            <Fragment>
+              <NavLink href="https://sentry.io/">Sign In</NavLink>
+              <NavLink
+                href="https://sentry.io/signup/"
+                className="transition-all duration-300 ease-in-out hover:bg-gradient-to-r hover:from-[#fa7faa] hover:via-[#ff9691] hover:to-[#ffb287]"
+              >
+                Get Started
+              </NavLink>
+            </Fragment>
           )}
->>>>>>> Stashed changes
         </div>
         <div className="lg:hidden ml-auto">
           <MobileMenu pathname={pathname} searchPlatforms={searchPlatforms} />