Merge Issues

This commit is contained in:
Belen Curcio
2021-01-11 12:17:55 -03:00
parent 9ffc60ec95
commit 72b5fb0c1a
2 changed files with 7 additions and 25 deletions

View File

@@ -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,