diff options
Diffstat (limited to 'packages/website/ts/@next/pages')
-rw-r--r-- | packages/website/ts/@next/pages/landing.tsx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/website/ts/@next/pages/landing.tsx b/packages/website/ts/@next/pages/landing.tsx index fa2bf45a1..c0cda84cf 100644 --- a/packages/website/ts/@next/pages/landing.tsx +++ b/packages/website/ts/@next/pages/landing.tsx @@ -5,10 +5,14 @@ import { colors } from 'ts/style/colors' import { Button, ButtonTransparent } from 'ts/@next/components/button'; import { Column, Section, Wrap } from 'ts/@next/components/layout'; import { SiteWrap } from 'ts/@next/components/siteWrap'; +<<<<<<< Updated upstream import { Heading, Intro, Text } from 'ts/@next/components/text'; import logoOutlined from 'ts/@next/icons/illustrations/logo-outlined.svg'; import protocol from 'ts/@next/icons/illustrations/protocol.svg'; +======= +import { Section, Wrap } from 'ts/@next/components/layout'; +>>>>>>> Stashed changes const Icon = styled.div` flex-shrink: 0; |