# Conflicts:
#	dist/index.html
#	dist/js/app.8c69702d.js
#	dist/js/chunk-372edb4c.dd3a4d37.js

# Conflicts:
#	dist/css/chunk-0ed85f5a.859d99ef.css
#	dist/css/chunk-30fdcc87.eeee47a9.css
#	dist/css/chunk-3cc0c584.ab7f0b6f.css
#	dist/css/chunk-5113f89e.5af45a64.css
#	dist/css/chunk-5113f89e.c8051181.css
#	dist/css/chunk-fa650fdc.947036af.css
#	dist/css/gic-card.96aadff2.css
#	dist/index.html
#	dist/js/app.7314935a.js
#	dist/js/app.d44fbb11.js
#	dist/js/app.ffeed4d3.js
#	dist/js/card-package~gic-card.e4df0a6b.js
#	dist/js/chunk-30fdcc87.6067a52e.js
#	dist/js/chunk-3cc0c584.7ab7b489.js
#	dist/js/chunk-5113f89e.e956768f.js
#	dist/js/chunk-fa650fdc.129bcbb9.js
#	src/components/stock-list/dialog.vue
#	src/components/stock-upload-record/index.vue

# Conflicts:
#	dist/index.html
#	dist/js/app.ede5502b.js

# Conflicts:
#	dist/css/card-package.659cdc17.css
#	dist/css/chunk-56cace44.7153bbea.css
#	dist/index.html
#	dist/js/app.382893d3.js
#	dist/js/chunk-0860f57a.d90a5213.js
#	dist/js/chunk-a3d44a22.72f8dd8d.js
#	dist/js/chunk-e4115e52.ffe2c90f.js
#	dist/js/gic-card.058e4436.js

# Conflicts:
#	dist/css/chunk-e4115e52.a5f9b5b8.css
#	dist/css/gic-card.56f7c349.css
#	dist/index.html
#	dist/js/app.69fd8bcb.js
#	dist/js/chunk-e2c4e4f8.fa28121e.js
#	dist/js/chunk-e4115e52.ff7d36a7.js
#	dist/js/chunk-e4115e52.ffe2c90f.js