# Conflicts:
#	dist/index.html
#	dist/static/css/main.717ba8f7380b46594863c7b5d6ae8ea0.css
#	dist/static/css/main.7b83551d2d836baf07258d5baaf8791a.css
#	dist/static/css/main.ff54dbdec47bda1975156de72cd16c0f.css

# Conflicts:
#	dist/index.html
#	dist/static/css/main.7b83551d2d836baf07258d5baaf8791a.css
#	dist/static/css/main.ab04aae490ebd0b8071d0709fb56a75a.css
#	dist/static/css/main.f6db7ce0259baafcbaf1248b6bdeb07d.css
#	dist/static/js/manifest.da2c584588724cecfe2c.js

# Conflicts:
#	dist/index.html
#	dist/static/css/main.7b50cfd5aa01b6792fa833c51c86a8eb.css
#	dist/static/css/main.f678d87e384011ccefcb59ca5b247816.css
#	dist/static/css/main.f6db7ce0259baafcbaf1248b6bdeb07d.css
#	dist/static/js/manifest.276f2ac0191a99fa0e73.js
#	dist/static/js/manifest.53f1c76eb811db84e68d.js
#	dist/static/js/manifest.87c6714c74b0f26564de.js

fix: 文案调整

See merge request !138

Release

See merge request !137

# Conflicts:
#	dist/index.html
#	dist/static/css/main.4fa83a75c94e30d8a1f0860c6de52153.css
#	dist/static/css/main.7c09bdebb40bac3b29ecee2bb7a7f883.css
#	dist/static/css/main.f678d87e384011ccefcb59ca5b247816.css
#	dist/static/js/manifest.87c6714c74b0f26564de.js

# Conflicts:
#	dist/index.html
#	dist/static/js/manifest.d4016a40f31904facb01.js

# Conflicts:
#	dist/index.html
#	dist/static/css/main.0855bbcbb3603daf70f579581537bb18.css
#	dist/static/css/main.4fa83a75c94e30d8a1f0860c6de52153.css
#	dist/static/css/main.5ac3df22a6db65b87857830927d3012c.css

# Conflicts:
#	dist/index.html
#	dist/static/css/main.0855bbcbb3603daf70f579581537bb18.css
#	dist/static/css/main.7156f6ca97a4dfa400cb75c4c807068d.css
#	dist/static/css/main.77bc98e2dffea0b0d498abbf4f04b29c.css
#	dist/static/js/manifest.51f7806fc831e5a8d659.js

Release

See merge request !136

# Conflicts:
#	dist/index.html
#	dist/static/css/main.16bfce300d8d693714ca89af6416b26a.css
#	dist/static/css/main.7156f6ca97a4dfa400cb75c4c807068d.css
#	dist/static/css/main.d96dfc6117cd0589652426772559436b.css
#	dist/static/js/manifest.5c3a850af62f233d1d6e.js
#	index.html

# Conflicts:
#	dist/index.html
#	index.html

# Conflicts:
#	dist/index.html
#	index.html

fix: track

See merge request !135

# Conflicts:
#	dist/index.html
#	dist/static/css/main.d96dfc6117cd0589652426772559436b.css
#	dist/static/css/main.ea6e003c2e7858a578c671efaef26e1c.css
#	dist/static/css/main.f2c0924643982a716fd64fba523a6251.css
#	dist/static/js/manifest.75c5fce2ce1441c1e151.js
#	dist/static/js/manifest.b605e4c558c8c156d17d.js
#	dist/static/js/manifest.e75245032ec72c10c24c.js
#	index.html

update: store-new.2.0.68

See merge request !134

# Conflicts:
#	dist/index.html
#	index.html