From ab4493e589456bd1e7992611149a3102ce85fc7c Mon Sep 17 00:00:00 2001 From: cygouw Date: Fri, 5 Jun 2026 09:10:14 +0700 Subject: [PATCH] fix: resolve merge conflict from feature/bilingual-support --- groups/C4A/index.html | 16 ++++++++++------ groups/C4A/js/main.js | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/groups/C4A/index.html b/groups/C4A/index.html index e6f10bd..a74285a 100644 --- a/groups/C4A/index.html +++ b/groups/C4A/index.html @@ -1,4 +1,4 @@ - + @@ -1162,7 +1162,7 @@
LAYANAN AKADEMIK • INFORMATIKA UNTAN

- Staf Pendukung &
+ Staf Pendukung &
Standar Operasional Prosedur (SOP)

Halaman ini menampilkan informasi petugas @@ -1225,12 +1225,15 @@

- +
@@ -1268,7 +1271,8 @@
- +

Pertanyaan yang Sering Diajukan

Temukan jawaban cepat atas pertanyaan umum mahasiswa seputar layanan akademik prodi.

diff --git a/groups/C4A/js/main.js b/groups/C4A/js/main.js index 56a0743..1bb53ca 100644 --- a/groups/C4A/js/main.js +++ b/groups/C4A/js/main.js @@ -48,7 +48,7 @@ async function initApp() { initAnimations(); }, 100); } catch (error) { - console.error('Terjadi kesalahan saat menginisialisasi aplikasi C4A:', error); + console.error('Terjadi kesalahan saat menginisialisasi halaman:', error); } }