From abd98336c162ff20e810d41adaa713d9edcdd67d Mon Sep 17 00:00:00 2001 From: riefive Date: Sat, 6 Sep 2025 15:28:52 +0700 Subject: [PATCH] fix: resolve conflict at sys.json again --- public/side-menu-items/sys.json | 47 --------------------------------- 1 file changed, 47 deletions(-) diff --git a/public/side-menu-items/sys.json b/public/side-menu-items/sys.json index 0d9f2dc1..e10aab27 100644 --- a/public/side-menu-items/sys.json +++ b/public/side-menu-items/sys.json @@ -243,52 +243,5 @@ ] } ] -<<<<<<< HEAD - }, - { - "title": "Rawat Inap", - "icon": "i-lucide-building-2", - "link": "/rawat-inap" - }, - { - "title": "VClaim BPJS", - "icon": "i-lucide-refresh-cw", - "link": "/vclaim", - "badge": "Live" - }, - { - "title": "SATUSEHAT", - "icon": "i-lucide-database", - "link": "/satusehat", - "badge": "FHIR" - }, - { - "title": "Peralatan dan Perlengkapan", - "icon": "i-lucide-dock", - "link": "/tools-equipment-src", - "children": [ - { - "title": "Perlengkapan (BMHP)", - "icon": "i-lucide-panel-bottom", - "link": "/tools-equipment-src/equipment" - } - ] - }, - { - "title": "Medical Records", - "icon": "i-lucide-file-text", - "link": "/medical-records" - }, - { - "title": "Laporan", - "icon": "i-lucide-clipboard-list", - "link": "/laporan" - }, - { - "title": "Monitoring", - "icon": "i-lucide-bar-chart-3", - "link": "/monitoring" -======= ->>>>>>> 1ee3772e80e0b5dcfc746b67c21585871dcb7f56 } ]