# Conflicts:
#   src/components/canvas/customComponent/UserView.vue
#   src/lang/en.js
#   src/lang/tw.js
#   src/lang/zh.js
#   src/views/chart/group/Group.vue
#   src/views/chart/view/ChartEdit.vue