Fix merge conflict

stripe · Nov 27, 2024 · 9ed495d · 9ed495d
1 parent ad980b2
commit 9ed495d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/app/components/Nav.tsx b/app/components/Nav.tsx
@@ -48,15 +48,12 @@ const navigationMenuItems = [
     paths: [],
   },
   {
-<<<<<<< Updated upstream
-=======
     label: 'Billing',
     href: '/billing',
     icon: CoinsIcon,
     paths: [],
   },
   {
->>>>>>> Stashed changes
     label: 'Account',
     href: '/settings',
     icon: SettingsIcon,