fix: merge conflicts

nextui-org · Nov 20, 2024 · 52822e9 · 52822e9
2 parents 341b5de + 9581891
commit 52822e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/docs/content/docs/guide/routing.mdx b/apps/docs/content/docs/guide/routing.mdx
@@ -269,7 +269,7 @@ function RootRoute() {
   return (
     <NextUIProvider 
       navigate={(to, options) => router.navigate({ to, ...options })}
-      useHref={(to) => router.buildLocation(to).href}
+      useHref={(to) => router.buildLocation({ to }).href}
     >
       {/* You app here... */}
     </NextUIProvider>

diff --git a/packages/core/react/README.md b/packages/core/react/README.md
@@ -39,7 +39,7 @@ Visit [https://storybook.nextui.org](https://storybook.nextui.org/) to view the
 Canary versions are available after every merge into `canary` branch. You can install the packages with the tag `canary` in npm to use the latest changes before the next production release.
 
 - [Documentation](https://canary.nextui.org/docs)
-- [Storybook](https://canary-storybook.nextui.org)
+- [Storybook](https://canary-sb.nextui.org)
 
 ## Community