# Conflicts: # project.config.json # src/pages/order/orderConfirm/orderConfirm.js
# Conflicts: # src/app.js # src/pages/order/orderConfirm/orderConfirm.js # src/pages/orderDetail/index.js # src/pages/orderList/index.js
Hotfix/onlaunch See merge request !6
Release/6.8.4 See merge request !5