# Conflicts: # nezha-fronted/src/components/chart/chartList.vue # nezha-fronted/src/components/chart/panelChart.vue