solving conflict

9031c6b0 · herman · 8ace5649 · 9031c6b0 · 9031c6b0
Commit 9031c6b0 authored Feb 23, 2021 by herman
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 437 deletions

DashboardCAT.js src/container/Laporan/DashboardCAT.js +4 -212

ExceutiveScoreboard.js src/container/Laporan/ExceutiveScoreboard.js +1 -225

No files found.
--- a/src/container/Laporan/DashboardCAT.js
+++ b/src/container/Laporan/DashboardCAT.js
--- a/src/container/Laporan/ExceutiveScoreboard.js
+++ b/src/container/Laporan/ExceutiveScoreboard.js