fixing merge
This commit is contained in:
parent
12fe01699a
commit
c05fe57e19
@ -1,10 +1,7 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
import { MapCardView } from './MapCardView'
|
import { MapCardView } from './MapCardView'
|
||||||
<<<<<<< HEAD
|
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
=======
|
|
||||||
>>>>>>> 704a063fab24d25c7fb5ae87eed00d7dfec73306
|
|
||||||
|
|
||||||
interface MapCardInterface {
|
interface MapCardInterface {
|
||||||
title: string,
|
title: string,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user