leeheejin 6a5cf839a7 Merge branch 'main' into lhj ... 충돌 해결: - CanvasElement.tsx: CustomMetricWidget(main) + 통합 TaskWidget(lhj) 모두 유지 - DashboardTopMenu.tsx: lhj의 '일정관리 위젯' 유지 - DashboardSidebar.tsx: main의 삭제 수락		2025-10-23 15:14:47 +09:00
..
widgets	Merge branch 'main' into lhj	2025-10-23 15:14:47 +09:00
DashboardViewer.tsx	Merge branch 'main' into lhj	2025-10-23 15:14:47 +09:00