# Conflicts: # build/webpack.base.config copy.js # build/webpack.base.config.js # src/locales/newWord.json # src/locales/zh-CN.json
