From df7041340a7474973ecf91bd6dd574473f23592a Mon Sep 17 00:00:00 2001
From: ilham_gmail <milham652@gmail.com>
Date: Fri, 5 Jun 2026 11:00:07 +0700
Subject: [PATCH] resolve merge conflict and bug

---
 groups/LimaEm/index.html | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/groups/LimaEm/index.html b/groups/LimaEm/index.html
index 6664532..4d2a653 100644
--- a/groups/LimaEm/index.html
+++ b/groups/LimaEm/index.html
@@ -1146,21 +1146,6 @@
     </div>
 
     <main id="main-content" class="min-h-screen bg-white">
-<<<<<<< HEAD
-        <div class="container mx-auto px-4 lg:px-8" style="padding-top: calc(88px + 3rem);">
-            <div class="mb-8 pb-8 border-b border-slate-200">
-                <span
-                    class="bg-untan-yellow text-slate-900 text-[10px] font-bold uppercase tracking-widest px-2 py-0.5 inline-block mb-3">Tugas
-                    Halaman Statis</span>
-                <h1 class="text-3xl lg:text-4xl font-bold text-slate-900 mb-2">Kehidupan Mahasiswa &amp; Himpunan (HMIF)
-                </h1>
-                <p class="text-slate-500 text-sm">Kelompok 07 &mdash; LIMA EM &nbsp;&middot;&nbsp; Informatika UNTAN
-                    2026</p>
-            </div>
-        </div>
-=======
-
->>>>>>> origin/main
         <div id="assignment-body" class="w-full">
             <!-- ================= START: BAGIAN YANG DIEDIT KELOMPOK ================= -->
             <!-- Hero Section -->
@@ -1275,16 +1260,10 @@
 
                             <!-- Frame foto — overflow hidden, foto full width tanpa crop -->
                             <div
-<<<<<<< HEAD
-                                class="relative rounded-2xl lg:rounded-3xl overflow-hidden shadow-2xl z-10 group cursor-default">
-                                <img src="./assets/images/ruang-tumbuh/ruangtumbuh_foto.jpeg"
-                                    alt="Ruang Tumbuh HMIF Universitas Tanjungpura" class="w-full h-auto block
-=======
                                 class="relative rounded-2xl lg:rounded-3xl overflow-hidden shadow-2xl z-10 group cursor-default"
                                 style="height: 420px;">
                                 <img src="./assets/images/ruang-tumbuh/ruangtumbuh_foto.jpeg"
                                     alt="Ruang Tumbuh HMIF Universitas Tanjungpura" class="w-full h-full object-cover block
->>>>>>> origin/main
                                                 transition-transform duration-700 ease-out group-hover:scale-[1.03]" />
                                 <!-- Gradient overlay bawah -->
                                 <div class="absolute inset-0
@@ -1316,11 +1295,7 @@
             </section>
 
             <!-- Partner & Kolaborator -->
-<<<<<<< HEAD
-            <section id="partners" class="bg-white py-16">
-=======
             <section id="partners" class="bg-white pb-16">
->>>>>>> origin/main
                 <div class="max-w-7xl 2xl:max-w-[1440px] mx-auto px-6 lg:px-12">
                     <h2 data-i18n="grp_limaem_partners_title"
                         class="text-2xl lg:text-3xl font-extrabold text-gray-900 mb-10">
-- 
2.52.0