# Conflicts: # frontend/src/views/chart/view/ChartStyle.vue # frontend/src/views/panel/list/PanelMain.vue