# Conflicts: # digital-park-web/digital-park/src/api/common.js # digital-park-web/digital-park/vue.config.js