Merge branch 'ml'
# Conflicts: # build/asset-manifest.json # build/index.html # build/mrstatic/css/1.bff22cf8.chunk.css # build/mrstatic/css/1.bff22cf8.chunk.css.map # build/mrstatic/css/44.0c7eea28.chunk.css # build/mrstatic/css/44.0c7eea28.chunk.css.map # build/mrstatic/css/46.50547718.chunk.css # build/mrstatic/css/46.50547718.chunk.css.map # build/mrstatic/css/47.2471f477.chunk.css # build/mrstatic/css/47.2471f477.chunk.css.map # build/mrstatic/css/49.0bb224f2.chunk.css # build/mrstatic/css/49.0bb224f2.chunk.css.map # build/mrstatic/css/50.ecbb6f9a.chunk.css # build/mrstatic/css/50.ecbb6f9a.chunk.css.map # build/mrstatic/css/51.9f46e45e.chunk.css # build/mrstatic/css/51.9f46e45e.chunk.css.map # build/mrstatic/css/52.ee45d0b0.chunk.css # build/mrstatic/css/52.ee45d0b0.chunk.css.map # build/mrstatic/css/53.025e3921.chunk.css # build/mrstatic/css/53.025e3921.chunk.css.map # build/mrstatic/css/54.ab7f5e40.chunk.css # build/mrstatic/css/54.ab7f5e40.chunk.css.map # build/mrstatic/css/55.4c85e85c.chunk.css # build/mrstatic/css/55.4c85e85c.chunk.css.map # build/mrstatic/css/56.470b9744.chunk.css # build/mrstatic/css/56.470b9744.chunk.css.map # build/mrstatic/css/57.10a4034d.chunk.css # build/mrstatic/css/57.10a4034d.chunk.css.map # build/mrstatic/css/58.697fa90d.chunk.css # build/mrstatic/css/58.697fa90d.chunk.css.map # build/mrstatic/css/59.eb90513f.chunk.css # build/mrstatic/css/59.eb90513f.chunk.css.map # build/mrstatic/css/60.e51ea0fc.chunk.css # build/mrstatic/css/60.e51ea0fc.chunk.css.map # build/mrstatic/css/BargainMiddlePage.31cef199.chunk.css # build/mrstatic/css/BargainMiddlePage.31cef199.chunk.css.map # build/mrstatic/css/CourseList.47812ac6.chunk.css # build/mrstatic/css/CourseList.47812ac6.chunk.css.map # build/mrstatic/css/Preferential.18d20d0c.chunk.css # build/mrstatic/css/Preferential.18d20d0c.chunk.css.map # build/mrstatic/css/blessing-preheat.715eb28a.chunk.css # build/mrstatic/css/blessing-preheat.715eb28a.chunk.css.map # build/mrstatic/css/coupons.c10ecc19.chunk.css # build/mrstatic/css/coupons.c10ecc19.chunk.css.map # build/mrstatic/css/deposit-pay-order.219bad3d.chunk.css # build/mrstatic/css/deposit-pay-order.219bad3d.chunk.css.map # build/mrstatic/css/detail.581c1e79.chunk.css # build/mrstatic/css/detail.581c1e79.chunk.css.map # build/mrstatic/css/newyear-yearIndex.c8863d51.chunk.css # build/mrstatic/css/newyear-yearIndex.c8863d51.chunk.css.map # build/mrstatic/css/python-class.087d6571.chunk.css # build/mrstatic/css/python-class.087d6571.chunk.css.map # build/mrstatic/css/search.38c3e634.chunk.css # build/mrstatic/css/search.38c3e634.chunk.css.map # build/mrstatic/css/study.e406d228.chunk.css # build/mrstatic/css/video.e2426591.chunk.css # build/mrstatic/css/video.e2426591.chunk.css.map # build/mrstatic/js/0.831ae6fe.chunk.js # build/mrstatic/js/0.831ae6fe.chunk.js.map # build/mrstatic/js/1.0da84f78.chunk.js # build/mrstatic/js/2.4b0feba1.chunk.js # build/mrstatic/js/2.4b0feba1.chunk.js.map # build/mrstatic/js/3.23122e43.chunk.js # build/mrstatic/js/3.23122e43.chunk.js.map # build/mrstatic/js/44.2bdd7791.chunk.js.map # build/mrstatic/js/45.61d009e5.chunk.js.map # build/mrstatic/js/46.a629f588.chunk.js # build/mrstatic/js/46.a629f588.chunk.js.map # build/mrstatic/js/47.2ca99325.chunk.js # build/mrstatic/js/47.2ca99325.chunk.js.map # build/mrstatic/js/48.d4812779.chunk.js # build/mrstatic/js/48.d4812779.chunk.js.map # build/mrstatic/js/49.051942e7.chunk.js # build/mrstatic/js/49.051942e7.chunk.js.map # build/mrstatic/js/50.43f41e52.chunk.js # build/mrstatic/js/50.43f41e52.chunk.js.map # build/mrstatic/js/51.c8cb1e46.chunk.js # build/mrstatic/js/51.c8cb1e46.chunk.js.map # build/mrstatic/js/52.4034ab2b.chunk.js # build/mrstatic/js/52.4034ab2b.chunk.js.map # build/mrstatic/js/53.1f1008e3.chunk.js # build/mrstatic/js/53.1f1008e3.chunk.js.map # build/mrstatic/js/54.89c86038.chunk.js # build/mrstatic/js/54.89c86038.chunk.js.map # build/mrstatic/js/55.30d3c59c.chunk.js # build/mrstatic/js/55.30d3c59c.chunk.js.map # build/mrstatic/js/56.197c8c0d.chunk.js # build/mrstatic/js/56.197c8c0d.chunk.js.map # build/mrstatic/js/57.6f8154fc.chunk.js # build/mrstatic/js/57.6f8154fc.chunk.js.map # build/mrstatic/js/58.7e566970.chunk.js # build/mrstatic/js/58.7e566970.chunk.js.map # build/mrstatic/js/59.619ad0f3.chunk.js # build/mrstatic/js/59.619ad0f3.chunk.js.map # build/mrstatic/js/60.b6457fa4.chunk.js # build/mrstatic/js/60.b6457fa4.chunk.js.map # build/mrstatic/js/Activity.ac4a0fe5.chunk.js # build/mrstatic/js/Activity.ac4a0fe5.chunk.js.map # build/mrstatic/js/BargainMiddlePage.c947a931.chunk.js # build/mrstatic/js/BargainMiddlePage.c947a931.chunk.js.map # build/mrstatic/js/Classify.612ae3c5.chunk.js # build/mrstatic/js/Classify.612ae3c5.chunk.js.map # build/mrstatic/js/Country.fa37423d.chunk.js # build/mrstatic/js/Country.fa37423d.chunk.js.map # build/mrstatic/js/CourseList.2ba1a54d.chunk.js # build/mrstatic/js/CourseList.2ba1a54d.chunk.js.map # build/mrstatic/js/DrawDocument.45146edd.chunk.js # build/mrstatic/js/DrawDocument.45146edd.chunk.js.map # build/mrstatic/js/Examination.25a35bab.chunk.js # build/mrstatic/js/Examination.25a35bab.chunk.js.map # build/mrstatic/js/Invite.1117e4b3.chunk.js # build/mrstatic/js/Invite.1117e4b3.chunk.js.map # build/mrstatic/js/MyEdit.63615b98.chunk.js # build/mrstatic/js/MyEdit.63615b98.chunk.js.map # build/mrstatic/js/Order.f200ccd5.chunk.js # build/mrstatic/js/Order.f200ccd5.chunk.js.map # build/mrstatic/js/Orderinfo.fc86a9c4.chunk.js # build/mrstatic/js/Orderinfo.fc86a9c4.chunk.js.map # build/mrstatic/js/PayOrder.76639379.chunk.js # build/mrstatic/js/PayOrder.76639379.chunk.js.map # build/mrstatic/js/Preferential.215db653.chunk.js # build/mrstatic/js/Preferential.215db653.chunk.js.map # build/mrstatic/js/SearchResult.a74f8ae8.chunk.js # build/mrstatic/js/SearchResult.a74f8ae8.chunk.js.map # build/mrstatic/js/ShareCourse.9aab6716.chunk.js # build/mrstatic/js/ShareCourse.9aab6716.chunk.js.map # build/mrstatic/js/ShopCart.b35dc7d9.chunk.js # build/mrstatic/js/ShopCart.b35dc7d9.chunk.js.map # build/mrstatic/js/aist-share.bbf6875f.chunk.js # build/mrstatic/js/aist-share.bbf6875f.chunk.js.map # build/mrstatic/js/blessing-getPrize.58ca9c98.chunk.js # build/mrstatic/js/blessing-getPrize.58ca9c98.chunk.js.map # build/mrstatic/js/blessing-preheat.ca3de4ce.chunk.js # build/mrstatic/js/blessing-preheat.ca3de4ce.chunk.js.map # build/mrstatic/js/blessing-rank.6f70f5fc.chunk.js # build/mrstatic/js/blessing-rank.6f70f5fc.chunk.js.map # build/mrstatic/js/coupons.7be5e097.chunk.js # build/mrstatic/js/coupons.7be5e097.chunk.js.map # build/mrstatic/js/deposit-order.1187f849.chunk.js # build/mrstatic/js/deposit-order.1187f849.chunk.js.map # build/mrstatic/js/deposit-pay-order.2c2fc773.chunk.js # build/mrstatic/js/deposit-pay-order.2c2fc773.chunk.js.map # build/mrstatic/js/detail.0fe7478f.chunk.js # build/mrstatic/js/detail.0fe7478f.chunk.js.map # build/mrstatic/js/myorders.a4d64920.chunk.js # build/mrstatic/js/myorders.a4d64920.chunk.js.map # build/mrstatic/js/prize-winner-list.14afff0f.chunk.js # build/mrstatic/js/prize-winner-list.14afff0f.chunk.js.map # build/mrstatic/js/purchased.ba560357.chunk.js # build/mrstatic/js/purchased.ba560357.chunk.js.map # build/mrstatic/js/python-class.06270f73.chunk.js # build/mrstatic/js/python-class.06270f73.chunk.js.map # build/mrstatic/js/search.f4043014.chunk.js # build/mrstatic/js/search.f4043014.chunk.js.map # build/mrstatic/js/shareposter.2b476388.chunk.js # build/mrstatic/js/shareposter.2b476388.chunk.js.map # build/mrstatic/js/system-notices.a2a84595.chunk.js # build/mrstatic/js/system-notices.a2a84595.chunk.js.map # build/mrstatic/js/togroup.3bb0e7fd.chunk.js # build/mrstatic/js/togroup.3bb0e7fd.chunk.js.map # build/service-worker.js # src/router/router-config.js
Showing
build/favicon.ico
deleted
100755 → 0
File deleted
build/manifest.json
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
37.5 KB
55.6 KB
18.9 KB
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
File deleted
File deleted
File deleted
13 KB
18.6 KB
138 KB
65.6 KB
66.7 KB
src/components/ml/index.js
0 → 100644
src/components/ml/index.scss
0 → 100644
src/components/ml/poup/index.js
0 → 100644
src/components/ml/poup/index.scss
0 → 100644
src/components/ml/pythomDes/Study/index.js
0 → 100644
src/components/ml/pythomDes/Study/index.scss
0 → 100644
src/components/ml/pythomDes/Team/index.js
0 → 100644
src/components/ml/pythomDes/Team/index.scss
0 → 100644
src/components/ml/pythomDes/index.js
0 → 100644
src/components/ml/pythomDes/index.scss
0 → 100644
src/components/ml/pythonStudy/index.js
0 → 100644
src/components/ml/pythonStudy/index.scss
0 → 100644
src/components/mlShare/index.js
0 → 100644
src/components/mlShare/index.scss
0 → 100644