Fix merge konflik

Merge branch 'main' of https://git.ifuntanhub.dev/MuhammadFarras/student-web-if-development-kit
Merge pull request 'feature/fix-ukuran-foto-about' (#5 ) from feature/fix-ukuran-foto-about into main
2026-06-05 11:06:58 +07:00 · 2026-06-05 10:48:27 +07:00 · 2026-06-05 03:39:13 +00:00 · 2026-06-05 10:36:03 +07:00 · 2026-06-05 10:13:22 +07:00
1 changed files with 1 additions and 0 deletions
@@ -1146,6 +1146,7 @@
    </div>
    <main id="main-content" class="min-h-screen bg-white">
        <div id="assignment-body" class="w-full">
            <!-- ================= START: BAGIAN YANG DIEDIT KELOMPOK ================= -->
            <!-- Hero Section -->
Author	SHA1	Message	Date
Farras	da38e3eb11	Fix merge konflik	2026-06-05 11:06:58 +07:00
Farras	78eebd2099	Merge branch 'main' of https://git.ifuntanhub.dev/MuhammadFarras/student-web-if-development-kit	2026-06-05 10:48:27 +07:00
powji	1e1f2a33e5	Merge pull request 'feature/fix-ukuran-foto-about' (#5 ) from feature/fix-ukuran-foto-about into main Reviewed-on: #5	2026-06-05 03:39:13 +00:00
Farras	7028fc4f30	Fix merge conflicts in localization.js and LimaEm index.html	2026-06-05 10:36:03 +07:00
powji17	f343a1c7c6	Memperbaiki ukuran tinggi gambar pada section about agar lebih proporsional	2026-06-05 10:13:22 +07:00