# 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

# Conflicts:
#	dist/index.html
#	dist/static/css/main.66ac5b3392adfa9efae0662d8fd2d4db.css
#	dist/static/css/main.c58ee23e9d19fb03e1ccd5431e743335.css
#	dist/static/css/main.e8dd8cc0991e0d583279af0bece21240.css
#	dist/static/js/manifest.aca394d0d893afce70ba.js
#	dist/static/js/manifest.d5c4453c545406e5b1bb.js
#	dist/static/js/manifest.e3f607990844a287eaa9.js

# Conflicts:
#	dist/index.html
#	dist/static/css/main.c2acf0677fe2cac8abcef4a57e3f3271.css
#	dist/static/css/main.e8dd8cc0991e0d583279af0bece21240.css
#	dist/static/css/main.f5ad4973fde96978cc8d480bad150f20.css
#	dist/static/js/manifest.2a6f66654d51b80e8472.js
#	dist/static/js/manifest.8a7be78ccdbcfc6424df.js
#	dist/static/js/manifest.aca394d0d893afce70ba.js

# Conflicts:
#	dist/index.html
#	dist/static/css/main.48d44f4fa12f2843cd52b5776907fdfc.css
#	dist/static/css/main.b3b82c8f1d20686486c8540c6ef99225.css
#	dist/static/css/main.c2acf0677fe2cac8abcef4a57e3f3271.css
#	dist/static/js/card.275629ae3b7d6dbdf796.js
#	dist/static/js/card.9c94efa3bd3e8ad5a968.js
#	dist/static/js/card.de20800acd80415e47e5.js
#	dist/static/js/manifest.2a6f66654d51b80e8472.js
#	dist/static/js/manifest.567928b3a7d2e03ba33a.js
#	dist/static/js/manifest.d5eb9b8715fe88c2fece.js
#	index.html

# Conflicts:
#	dist/index.html

# Conflicts:
#	dist/index.html
#	dist/static/css/main.52830b21641ca249ef360f0fb4013492.css
#	dist/static/css/main.9454f077352978e56ceb69809ab04b72.css
#	dist/static/css/main.b3b82c8f1d20686486c8540c6ef99225.css
#	dist/static/js/manifest.567928b3a7d2e03ba33a.js

# Conflicts:
#	dist/index.html
#	dist/static/css/main.52830b21641ca249ef360f0fb4013492.css
#	dist/static/css/main.7156f6ca97a4dfa400cb75c4c807068d.css
#	dist/static/css/main.94de46aa9b5d2247ed3bc2490df7e3e5.css