fix: adjust conflict merge main

2026-01-02 09:32:09 +07:00 · 2026-01-02 09:32:09 +07:00 · 0df4c37136
parent 9e497069a3
commit 0df4c37136
1 changed files with 0 additions and 4 deletions
--- a/components/form/setting/form-add-iklan-update.tsx
+++ b/components/form/setting/form-add-iklan-update.tsx
@ -634,11 +634,7 @@ export function TambahIklanUpdate() {
                ))}

                <Image
-<<<<<<< HEAD
                  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"
                  className=" rounded-md my-3"
                  width={300}