# Conflicts: # app.json # env/env.js # pages/apply/index.wxml # pages/index/index.js # pages/user/login/login.js # project.config.json # utils/API.js