# Conflicts:
#	dist/index.html
#	dist/js/app.a0a63180.js
#	dist/js/app.c68bde7f.js
#	dist/js/app.ffcc74ac.js
#	dist/js/chunk-3339acd5.ae0b9220.js

# Conflicts:
#	dist/css/app.5d2b2e5a.css
#	dist/css/app.65f5fb46.css
#	dist/css/app.92c856b3.css
#	dist/css/chunk-062ed6dd.821ab53e.css
#	dist/css/chunk-0e48fd14.2ff973ee.css
#	dist/css/chunk-2dfc3876.821ab53e.css
#	dist/css/chunk-36f40ade.2ff973ee.css
#	dist/css/chunk-67d88149.2ff973ee.css
#	dist/css/chunk-7eb10ad4.821ab53e.css
#	dist/index.html
#	dist/js/app.00e94d4f.js
#	dist/js/card-package.6d761f72.js
#	dist/js/card-package.a8314994.js
#	dist/js/card-package.aace7e1c.js
#	dist/js/card-package~gic-card.0b78a17a.js
#	dist/js/chunk-0d4ebdfa.14b3849f.js
#	dist/js/chunk-0d4ebdfa.a5b97e85.js
#	dist/js/chunk-0d4ebdfa.d53246c1.js
#	dist/js/chunk-2116ff36.8484cfb3.js
#	dist/js/chunk-28cb370c.f64da662.js
#	dist/js/chunk-331988dc.dce5d678.js
#	dist/js/chunk-34bff564.4431ebc7.js
#	dist/js/chunk-3634aeb6.4d05f6f7.js
#	dist/js/chunk-40634738.c0f01e19.js
#	dist/js/chunk-53f4695c.00b1ac67.js
#	dist/js/chunk-53f4695c.8b87bbe4.js
#	dist/js/chunk-6287d3af.6e0ff885.js
#	dist/js/chunk-62c969ce.0602749a.js
#	dist/js/chunk-7690a1e6.477157ae.js
#	dist/js/chunk-7c59afb3.1cf663c5.js
#	dist/js/chunk-7eb10ad4.5cb38e77.js
#	dist/js/chunk-9490a5cc.f606ed6e.js
#	dist/js/chunk-b82cb698.1d9b83a1.js
#	dist/js/chunk-d079a54c.63c344ba.js
#	dist/js/chunk-vendors.74bafd00.js

# Conflicts:
#	dist/index.html
#	dist/js/app.3f603642.js
#	dist/js/card-package.d4487040.js
#	dist/js/card-package~gic-card.639ac33a.js
#	src/views/gift-manage/real-stock-list.vue
#	src/views/gift-manage/virtual-stock-list.vue

# Conflicts:
#	dist/index.html
#	dist/js/app.49e2e88a.js
#	dist/js/card-package.61eb7104.js
#	dist/js/card-package~gic-card.80c5b211.js
#	dist/js/gic-card.92885930.js

# Conflicts:
#	dist/index.html
#	dist/js/app.9491ada1.js
#	dist/js/chunk-0d4ebdfa.10e08b86.js
#	dist/js/chunk-0d4ebdfa.451811ba.js
#	dist/js/chunk-0d4ebdfa.f3163d80.js
#	dist/js/chunk-19510fda.8acff3bb.js
#	dist/js/chunk-1c02b44e.0867831a.js
#	dist/js/chunk-28cb370c.61f53ccc.js
#	dist/js/chunk-34bff564.ddde5d4d.js
#	dist/js/chunk-40634738.68f48390.js
#	dist/js/chunk-40634738.747db852.js
#	dist/js/chunk-40634738.acdd7121.js
#	dist/js/chunk-4fc0e81c.d388e2fd.js
#	dist/js/chunk-6287d3af.47d9377c.js
#	dist/js/chunk-7a226a22.3d1ead70.js
#	dist/js/chunk-edf46648.da189466.js

# Conflicts:
#	dist/index.html
#	dist/js/app.4ffa8d54.js
#	dist/js/card-package.6d2b680e.js
#	dist/js/chunk-0d4ebdfa.6e24cbce.js
#	dist/js/chunk-331988dc.5501d5e7.js
#	dist/js/chunk-331988dc.93b07338.js
#	dist/js/chunk-331988dc.dce5d678.js
#	dist/js/chunk-342a4127.7ea4ab56.js
#	dist/js/chunk-34bff564.ee9995d3.js
#	dist/js/chunk-36f40ade.49385487.js
#	dist/js/chunk-36f40ade.55612e17.js
#	dist/js/chunk-36f40ade.e16bdf31.js
#	dist/js/chunk-4fc0e81c.b6567938.js
#	dist/js/chunk-6287d3af.93237782.js
#	dist/js/chunk-7a226a22.38a77037.js
#	dist/js/chunk-7eb10ad4.5cb38e77.js
#	dist/js/chunk-7eb10ad4.a0691e37.js
#	dist/js/chunk-7eb10ad4.ea414a2a.js
#	dist/js/chunk-ad95361e.598a10db.js
#	dist/js/chunk-edf46648.1a2c97a9.js
#	dist/js/chunk-edf46648.7e31fa28.js
#	dist/js/chunk-edf46648.f9e04205.js
#	dist/js/chunk-f95812e2.a9ff509c.js
#	dist/js/gic-card.781a1f09.js