# 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

# 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

# Conflicts:
#	dist/index.html
#	dist/static/css/main.5c52b8b27322d429aa2f6d64f296b710.css
#	dist/static/css/main.a64b4629c6265900cd4d3fe487df7e10.css
#	dist/static/css/main.f2c0924643982a716fd64fba523a6251.css
#	dist/static/js/manifest.4619f24378d924122188.js
#	dist/static/js/manifest.75c5fce2ce1441c1e151.js
#	dist/static/js/manifest.cb95bf12f5ffc497c209.js
#	index.html

# Conflicts:
#	dist/index.html
#	dist/static/css/main.16bfce300d8d693714ca89af6416b26a.css
#	dist/static/css/main.5c52b8b27322d429aa2f6d64f296b710.css
#	dist/static/css/main.7b012c962dde9cc81785d426b23e9cf4.css
#	dist/static/js/main.a38bc9dd2a1132342ec3.js
#	dist/static/js/manifest.5c3a850af62f233d1d6e.js
#	index.html

# Conflicts:
#	dist/index.html
#	dist/static/css/main.029a2e97751fea05c7eb7dd6acc2a424.css
#	dist/static/css/main.72677c4aa419909ff954da09c4a4c18d.css
#	dist/static/css/main.a64b4629c6265900cd4d3fe487df7e10.css
#	dist/static/js/manifest.91ad807ad87779af7186.js
#	dist/static/js/manifest.bbf8cc9626b9d4ac0069.js
#	dist/static/js/manifest.cb95bf12f5ffc497c209.js

# Conflicts:
#	dist/index.html
#	dist/static/css/main.2651fca2c521eedce01304a4186f2007.css
#	dist/static/css/main.66ac5b3392adfa9efae0662d8fd2d4db.css
#	dist/static/css/main.72677c4aa419909ff954da09c4a4c18d.css
#	dist/static/js/manifest.72039f3c5031f8aea13b.js
#	dist/static/js/manifest.91ad807ad87779af7186.js
#	dist/static/js/manifest.e3f607990844a287eaa9.js