# Conflicts:
#	.env.development

# Conflicts:
#	dist/index.html
#	dist/static/css/app.869d8c64.css
#	dist/static/css/chunk-11e11e1c.0934badc.css
#	dist/static/css/chunk-14356e48.7d5c00e2.css
#	dist/static/css/chunk-1d571893.0615606c.css
#	dist/static/css/chunk-242f810e.c9a455ad.css
#	dist/static/css/chunk-57872cf8.9183fc08.css
#	dist/static/css/chunk-612d55f9.3c72d4e5.css
#	dist/static/css/chunk-6899b162.3fd47436.css
#	dist/static/css/chunk-6cbfafa6.43a2482e.css
#	dist/static/css/chunk-7cd8bac8.f9a06397.css
#	dist/static/css/chunk-8457bade.e539ec29.css
#	dist/static/css/chunk-fa6b139a.fe6be668.css
#	dist/static/css/chunk-fa9f02d6.354a7711.css
#	dist/static/js/chunk-0b4a9e9a.fd971fbe.js
#	dist/static/js/chunk-2d0c741e.9a348a52.js
#	dist/static/js/chunk-2d0c7ece.2a006d79.js
#	dist/static/js/chunk-2d0cbf05.598ccefa.js
#	dist/static/js/chunk-2d0d67a2.84ed189f.js
#	dist/static/js/chunk-2d0e28b6.6ab0b1aa.js
#	dist/static/js/chunk-2d226555.e093ec60.js
#	dist/static/js/chunk-2d22db58.ad412c78.js
#	dist/static/js/chunk-6899b162.ae1d0621.js
#	dist/static/js/chunk-779f4447.0821cf4a.js
#	dist/static/js/chunk-7c2f4fe6.b3ee176d.js
#	dist/static/js/chunk-libs.659b6a20.js

# Conflicts:
#	.env.development

# Conflicts:
#	dist/index.html
#	dist/static/css/chunk-47d1c267.49c4beab.css
#	dist/static/css/chunk-676e3f8f.1d097ee4.css
#	dist/static/css/chunk-fe448e72.d0b225dc.css
#	dist/static/js/chunk-1516e206.72adf324.js
#	dist/static/js/chunk-17db7236.5b85003e.js
#	dist/static/js/chunk-1b9ca1bf.16665703.js
#	dist/static/js/chunk-1d0d7df2.550a9872.js
#	dist/static/js/chunk-47c51416.42d1d71b.js
#	dist/static/js/chunk-4b29491c.a614a9b5.js
#	dist/static/js/chunk-612d55f9.c756653f.js.map
#	dist/static/js/chunk-64b639c7.94b65cd6.js
#	dist/static/js/chunk-6818dae4.b8a2cba7.js
#	dist/static/js/chunk-6818dae4.b8a2cba7.js.map
#	dist/static/js/chunk-7c2f4fe6.a6e494d8.js
#	dist/static/js/chunk-7c2f4fe6.a6e494d8.js.map
#	dist/static/js/chunk-7cd8bac8.cb100774.js
#	dist/static/js/chunk-8457bade.fae1e02b.js.map
#	dist/static/js/chunk-f18f73fa.d463b6c6.js
#	dist/static/js/runtime.1dc8b0ce.js.map
#	dist/static/js/runtime.822b6907.js.map
#	dist/static/js/runtime.9e5c4e5d.js.map

# Conflicts:
#	dist/index.html
#	dist/static/css/app.018ae2b6.css
#	dist/static/css/app.7239b927.css
#	dist/static/css/app.981cdb47.css
#	dist/static/css/chunk-000b3ab4.9f670dd0.css
#	dist/static/css/chunk-1b9ca1bf.e539ec29.css
#	dist/static/css/chunk-395a9d81.6485bf58.css
#	dist/static/css/chunk-3c5d3e7a.d0adca96.css
#	dist/static/css/chunk-542b2550.d3829422.css
#	dist/static/css/chunk-5b4b2fda.6ab5ebe0.css
#	dist/static/css/chunk-8457bade.e539ec29.css
#	dist/static/css/chunk-bd8611ca.a3da7543.css
#	dist/static/css/chunk-d0560568.1d48f9b5.css
#	dist/static/css/chunk-d84713fc.208ad6b5.css
#	dist/static/js/chunk-1d0d7df2.985ae709.js
#	dist/static/js/chunk-3c5d3e7a.de3ef871.js
#	dist/static/js/chunk-41dc9244.f15022e4.js
#	dist/static/js/chunk-47c51416.42d1d71b.js
#	dist/static/js/chunk-7c2f4fe6.13bc5f69.js
#	dist/static/js/chunk-7c2f4fe6.33f71712.js
#	dist/static/js/chunk-7c2f4fe6.a6e494d8.js
#	dist/static/js/chunk-b0d57d44.a672684b.js
#	dist/static/js/chunk-b4915312.bc882284.js
#	dist/static/js/chunk-bd8611ca.0033f7f2.js