fix: adjust conflict merge main
This commit is contained in:
parent
9e497069a3
commit
0df4c37136
|
|
@ -634,11 +634,7 @@ export function TambahIklanUpdate() {
|
||||||
))}
|
))}
|
||||||
|
|
||||||
<Image
|
<Image
|
||||||
<<<<<<< HEAD
|
|
||||||
src={`https://mediahub.polri.go.id/api/v2/advertisements/viewer/${id}`}
|
src={`https://mediahub.polri.go.id/api/v2/advertisements/viewer/${id}`}
|
||||||
=======
|
|
||||||
src={`https://new.netidhub.com/api/advertisements/viewer/${id}`}
|
|
||||||
>>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815
|
|
||||||
alt="Thumbnail Gambar Utama"
|
alt="Thumbnail Gambar Utama"
|
||||||
className=" rounded-md my-3"
|
className=" rounded-md my-3"
|
||||||
width={300}
|
width={300}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue