mirror of
https://github.com/vercel/commerce.git
synced 2025-07-22 20:26:49 +00:00
Merge Issues
This commit is contained in:
@@ -6,12 +6,8 @@ import { Layout } from '@components/common'
|
||||
import { Heart } from '@components/icons'
|
||||
import { Text, Container } from '@components/ui'
|
||||
import { WishlistCard } from '@components/wishlist'
|
||||
<<<<<<< HEAD
|
||||
import { defatultPageProps } from '@lib/defaults'
|
||||
import { useCustomer } from '@framework/customer'
|
||||
=======
|
||||
import { defaultPageProps } from '@lib/defaults'
|
||||
>>>>>>> master
|
||||
import { useCustomer } from '@framework/customer'
|
||||
|
||||
export async function getStaticProps({
|
||||
preview,
|
||||
|
Reference in New Issue
Block a user