# Conflicts:
#	dist/index.html
#	dist/static/css/main.12d11ef22aaea1a4890a3636db530bbb.css
#	dist/static/css/main.488e27612d0ea2441885f81b4bd425fd.css
#	dist/static/css/main.5653237ff7a722b06e06f2571bb47f16.css
#	dist/static/js/16.3b17d743d502b83d338f.js
#	dist/static/js/16.bea1e19a292b8b599704.js
#	dist/static/js/16.dd1cdb4b3a82c25a3526.js
#	dist/static/js/18.65f42a7dbc2b1236e85b.js
#	dist/static/js/card.4dfada83fbc79659c638.js
#	dist/static/js/ecm.641309d1a2f2fdcecdaa.js
#	dist/static/js/ecm.763c5b056cf0a48875b2.js
#	dist/static/js/ecm.ecc8d90767737556b435.js
#	dist/static/js/evaluation.0756ab734cd7ddc9e1b3.js
#	dist/static/js/evaluation.a5b854bbbee63abccbb4.js
#	dist/static/js/evaluation.d218fe24b42b81fa0acf.js
#	dist/static/js/msg.0da42538485540d84757.js
#	dist/static/js/msg.200e6bfe2fb2f86c8231.js
#	dist/static/js/msg.4ce8a21b87223c7d3c64.js
#	dist/static/js/popup.d9cfb7b96562f9ebe366.js
#	dist/static/js/signIn.d26bee1b38e9066d3bb4.js

# Conflicts:
#	src/service/api/cardApi.js

# Conflicts:
#	dist/index.html
#	dist/static/css/main.488e27612d0ea2441885f81b4bd425fd.css
#	dist/static/css/main.9cc4f496dfc6be2539a576cd9868b7cd.css
#	dist/static/js/manifest.8025125b9f1a531cb873.js
#	dist/static/js/manifest.fbf3168e0c77db75bf9c.js