# Conflicts: # frontend/config/proxy.ts # frontend/config/routes.ts # frontend/dist/index.html # frontend/dist/t__plugin-layout__Layout.0044e113.async.js # frontend/dist/umi.65cd7f67.js # frontend/src/pages/user/login/index.tsx
# Conflicts: # backend/BPA.MES.Base.Web.Entry/Properties/launchSettings.json