# Conflicts:
#	build/asset-manifest.json
#	build/index.html
#	build/mrstatic/css/1.c01d100f.chunk.css
#	build/mrstatic/css/2.fd1b61f1.chunk.css
#	build/mrstatic/css/3.66642611.chunk.css
#	build/mrstatic/css/44.0a47f16b.chunk.css
#	build/mrstatic/css/46.d82f523f.chunk.css
#	build/mrstatic/css/47.6b450e29.chunk.css
#	build/mrstatic/css/49.0a40f258.chunk.css
#	build/mrstatic/css/50.44620a41.chunk.css
#	build/mrstatic/css/51.77f491f0.chunk.css
#	build/mrstatic/css/52.b2a1d44f.chunk.css
#	build/mrstatic/css/53.21f39c00.chunk.css
#	build/mrstatic/css/54.4ea9488d.chunk.css
#	build/mrstatic/css/55.b5dc8b5a.chunk.css
#	build/mrstatic/css/56.a756c762.chunk.css
#	build/mrstatic/css/57.f025d450.chunk.css
#	build/mrstatic/css/58.1620736f.chunk.css
#	build/mrstatic/css/59.c783b09f.chunk.css
#	build/mrstatic/css/60.42968ec0.chunk.css
#	build/mrstatic/css/BargainMiddlePage.98ff5f85.chunk.css
#	build/mrstatic/css/Classify.4393f5d0.chunk.css
#	build/mrstatic/css/Country.67334f4b.chunk.css
#	build/mrstatic/css/CourseList.cefe30f5.chunk.css
#	build/mrstatic/css/DrawDocument.58508f31.chunk.css
#	build/mrstatic/css/Examination.02475a25.chunk.css
#	build/mrstatic/css/Order.0ab178ef.chunk.css
#	build/mrstatic/css/PayOrder.4a91788c.chunk.css
#	build/mrstatic/css/Preferential.fd9b7b0b.chunk.css
#	build/mrstatic/css/SearchResult.b7ad8ad7.chunk.css
#	build/mrstatic/css/ShareCourse.c571c49e.chunk.css
#	build/mrstatic/css/ShopCart.f39ca42e.chunk.css
#	build/mrstatic/css/aist-share.7510d5bb.chunk.css
#	build/mrstatic/css/blessing-getPrize.5b618764.chunk.css
#	build/mrstatic/css/blessing-preheat.e8b5cd61.chunk.css
#	build/mrstatic/css/blessing-rank.4f55b203.chunk.css
#	build/mrstatic/css/coupons.940f5632.chunk.css
#	build/mrstatic/css/deposit-order.0cb67b20.chunk.css
#	build/mrstatic/css/deposit-pay-order.9f37b7bc.chunk.css
#	build/mrstatic/css/detail.1ba45cbd.chunk.css
#	build/mrstatic/css/myorders.6e68e44c.chunk.css
#	build/mrstatic/css/newyear-2019-landing.db9f44e0.chunk.css
#	build/mrstatic/css/newyear-yearIndex.09605590.chunk.css
#	build/mrstatic/css/prize-winner-list.0f4a4332.chunk.css
#	build/mrstatic/css/purchased.c5df408a.chunk.css
#	build/mrstatic/css/python-class.ba9a2030.chunk.css
#	build/mrstatic/css/search.85280180.chunk.css
#	build/mrstatic/css/shareposter.4618854a.chunk.css
#	build/mrstatic/css/study.ff9a66a8.chunk.css
#	build/mrstatic/css/system-notices.0a75b211.chunk.css
#	build/mrstatic/css/togroup.acc61e40.chunk.css
#	build/mrstatic/css/video.bbeaac0a.chunk.css
#	build/mrstatic/js/0.cc5b7652.chunk.js
#	build/mrstatic/js/0.cc5b7652.chunk.js.map
#	build/mrstatic/js/1.b89e5220.chunk.js
#	build/mrstatic/js/2.67551ec5.chunk.js
#	build/mrstatic/js/3.ad67f415.chunk.js
#	build/mrstatic/js/45.1369f485.chunk.js.map
#	build/mrstatic/js/47.18019c58.chunk.js
#	build/mrstatic/js/47.18019c58.chunk.js.map
#	build/mrstatic/js/49.3c0fdb66.chunk.js
#	build/mrstatic/js/49.3c0fdb66.chunk.js.map
#	build/mrstatic/js/50.8ea48656.chunk.js
#	build/mrstatic/js/51.b788fe04.chunk.js
#	build/mrstatic/js/52.a7230a6e.chunk.js
#	build/mrstatic/js/53.676dfd4f.chunk.js.map
#	build/mrstatic/js/54.9d40a9de.chunk.js
#	build/mrstatic/js/55.96d3ea96.chunk.js
#	build/mrstatic/js/56.4f11ca6d.chunk.js
#	build/mrstatic/js/56.4f11ca6d.chunk.js.map
#	build/mrstatic/js/57.f4163f78.chunk.js
#	build/mrstatic/js/57.f4163f78.chunk.js.map
#	build/mrstatic/js/58.f68f4db5.chunk.js
#	build/mrstatic/js/59.b5c08603.chunk.js
#	build/mrstatic/js/59.b5c08603.chunk.js.map
#	build/mrstatic/js/60.b83393b0.chunk.js
#	build/mrstatic/js/Activity.88881a06.chunk.js
#	build/mrstatic/js/BargainMiddlePage.aba550cf.chunk.js
#	build/mrstatic/js/Classify.9f115d41.chunk.js
#	build/mrstatic/js/Country.2af5d226.chunk.js
#	build/mrstatic/js/CourseList.2b30359e.chunk.js
#	build/mrstatic/js/DrawDocument.5ca29513.chunk.js
#	build/mrstatic/js/Examination.be1a4b8d.chunk.js
#	build/mrstatic/js/Examination.be1a4b8d.chunk.js.map
#	build/mrstatic/js/Invite.489f83b3.chunk.js
#	build/mrstatic/js/MyEdit.935b9601.chunk.js
#	build/mrstatic/js/Order.d675fa80.chunk.js
#	build/mrstatic/js/Orderinfo.cf832a2e.chunk.js
#	build/mrstatic/js/PayOrder.606ea6cc.chunk.js
#	build/mrstatic/js/Preferential.ed896c06.chunk.js
#	build/mrstatic/js/SearchResult.de3a92eb.chunk.js
#	build/mrstatic/js/SearchResult.de3a92eb.chunk.js.map
#	build/mrstatic/js/ShareCourse.d98be41d.chunk.js
#	build/mrstatic/js/ShopCart.eba476cd.chunk.js
#	build/mrstatic/js/ShopCart.eba476cd.chunk.js.map
#	build/mrstatic/js/aist-share.8089d0f2.chunk.js
#	build/mrstatic/js/aist-share.8089d0f2.chunk.js.map
#	build/mrstatic/js/blessing-getPrize.0ffd8a71.chunk.js
#	build/mrstatic/js/blessing-preheat.3370301e.chunk.js
#	build/mrstatic/js/blessing-rank.33219ca9.chunk.js
#	build/mrstatic/js/coupons.49251766.chunk.js
#	build/mrstatic/js/coupons.49251766.chunk.js.map
#	build/mrstatic/js/deposit-order.f07efd02.chunk.js
#	build/mrstatic/js/deposit-pay-order.b0286991.chunk.js
#	build/mrstatic/js/detail.9619b808.chunk.js
#	build/mrstatic/js/myorders.0b2d81ff.chunk.js
#	build/mrstatic/js/prize-winner-list.d8b3815a.chunk.js
#	build/mrstatic/js/prize-winner-list.d8b3815a.chunk.js.map
#	build/mrstatic/js/purchased.63a14030.chunk.js
#	build/mrstatic/js/python-class.38baa688.chunk.js
#	build/mrstatic/js/python-class.38baa688.chunk.js.map
#	build/mrstatic/js/search.1edc9604.chunk.js.map
#	build/mrstatic/js/shareposter.aa181f20.chunk.js
#	build/mrstatic/js/system-notices.3a56df5f.chunk.js
#	build/mrstatic/js/togroup.f7ea19e5.chunk.js
#	build/mrstatic/js/video.224d081d.chunk.js
#	build/service-worker.js
#	src/components/activity/1111/images/dalibao_bj.png~0dd982ef
#	src/components/activity/1111/images/formal-banner.png~0dd982ef
#	src/router/router-config.js

# Conflicts:
#	src/components/activity/treasure-box/treasure-box/team.js
#	src/router/router-config.js