resolve conflict: merge apeNameTeamE and grp_habisiniseminar translations

.gitignore

@@ -5,3 +5,5 @@ dist/
 .env.local
 groups/**/.env
 groups/**/.env.local
+README.md
+i18n.js

assets/global/localization.js

@@ -570,7 +570,6 @@ const translations = {
         kontrib_guideline_4: "Hindari plagiarisme. Karya harus orisinal.",
         kontrib_guideline_5: "Tim redaksi berhak menyunting konten untuk keperluan editorial.",
 
-<<<<<<< HEAD
         // --- apeNameTeamE (Halaman Beasiswa) ---
         ape_breadcrumb_profile: 'Profil',
         ape_breadcrumb_scholarship: 'Beasiswa',
@@ -597,7 +596,6 @@ const translations = {
         ape_cta_desc: 'Hubungi admin prodi untuk informasi terbaru tentang beasiswa dan program akademik.',
         ape_cta_btn1: 'DAFTAR BEASISWA',
         ape_cta_btn2: 'Hubungi Kami',
-=======
         // ── Page ──────────────────────────────────────────────────────────────
         grp_habisiniseminar_page_title: 'Penerimaan Mahasiswa Baru Informatika UNTAN | Kelompok 02',
         grp_habisiniseminar_brand: 'Informatika UNTAN Penerimaan Mahasiswa Baru',
@@ -780,7 +778,6 @@ const translations = {
         grp_habisiniseminar_month_apr_mei: 'April – Mei',
         grp_habisiniseminar_month_mei_jun: 'Mei – Juni',
         grp_habisiniseminar_month_jun_jul: 'Juni – Juli',
->>>>>>> a8fca707b9ab3bd2c757da13d9bb1b833e6ce4f9
     },
 
     en: {
@@ -1348,7 +1345,6 @@ const translations = {
         kontrib_guideline_4: "Avoid plagiarism. Work must be original.",
         kontrib_guideline_5: "The editorial team reserves the right to edit content for editorial purposes.",
 
-<<<<<<< HEAD
         // --- apeNameTeamE (Scholarship Page) ---
         ape_breadcrumb_profile: 'Profile',
         ape_breadcrumb_scholarship: 'Scholarship',
@@ -1375,7 +1371,6 @@ const translations = {
         ape_cta_desc: 'Contact the program admin for the latest scholarship and academic program information.',
         ape_cta_btn1: 'SCHOLARSHIP LIST',
         ape_cta_btn2: 'Contact Us',
-=======
         // ── Page ──────────────────────────────────────────────────────────────
         grp_habisiniseminar_page_title: 'New Student Admission Informatics UNTAN | Group 02',
         grp_habisiniseminar_brand: 'Informatics UNTAN New Student Admission',
@@ -1558,7 +1553,6 @@ const translations = {
         grp_habisiniseminar_month_apr_mei: 'April – May',
         grp_habisiniseminar_month_mei_jun: 'May – June',
         grp_habisiniseminar_month_jun_jul: 'June – July',
->>>>>>> a8fca707b9ab3bd2c757da13d9bb1b833e6ce4f9
     }
 };