From 9bb3ecd72846a507702bd4db1694065a50ebbc2d Mon Sep 17 00:00:00 2001 From: Ian Philips Date: Mon, 29 Aug 2022 10:23:53 -0600 Subject: [PATCH] Fix merge --- web/pages/post/[...slugs]/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/pages/post/[...slugs]/index.tsx b/web/pages/post/[...slugs]/index.tsx index 41c0d775..737e025f 100644 --- a/web/pages/post/[...slugs]/index.tsx +++ b/web/pages/post/[...slugs]/index.tsx @@ -5,7 +5,6 @@ import { Post } from 'common/post' import { Title } from 'web/components/title' import { Spacer } from 'web/components/layout/spacer' import { Content } from 'web/components/editor' -import { UserLink } from 'web/components/user-page' import { getUser, User } from 'web/lib/firebase/users' import { ShareIcon } from '@heroicons/react/solid' import clsx from 'clsx' @@ -16,6 +15,7 @@ import { Row } from 'web/components/layout/row' import { Col } from 'web/components/layout/col' import { ENV_CONFIG } from 'common/envs/constants' import Custom404 from 'web/pages/404' +import { UserLink } from 'web/components/user-link' export async function getStaticProps(props: { params: { slugs: string[] } }) { const { slugs } = props.params