# Conflicts: # backend/src/main/resources/generatorConfig.xml # frontend/src/lang/en.js # frontend/src/lang/tw.js # frontend/src/lang/zh.js # frontend/src/views/chart/view/ChartEdit.vue