# Conflicts:
#	client/.config.test.js
#	client/package.json
#	client/src/components/learnSysLayout/navigation.vue
#	client/src/components/learnSysLayout/sidebar.vue
#	client/src/pages/learn/courseDetail.vue
#	client/src/pages/survey/survey.vue
#	client/src/router/routes.js
#	server/client-dist/index.html
#	server/client-dist/resources/1.a87692f25ce6.css
#	server/client-dist/resources/10.1d2704826e0b.css
#	server/client-dist/resources/14.48f70f326947.css
#	server/client-dist/resources/15.687a7304ec60.css
#	server/client-dist/resources/22.5ac89ea3b13e.css
#	server/client-dist/resources/23.4721bd437700.css
#	server/client-dist/resources/23.cb56ec9d2354.css
#	server/client-dist/resources/24.a8fba85927a8.css
#	server/client-dist/resources/25.cb56ec9d2354.css
#	server/client-dist/resources/27.ac46a7f215a5.css
#	server/client-dist/resources/27.d59764fdb00e.css
#	server/client-dist/resources/28.8e95bcc47b2c.css
#	server/client-dist/resources/29.0f551f9e383c.css
#	server/client-dist/resources/30.6a9e6fc7a074.css
#	server/client-dist/resources/30.789ee889.js
#	server/client-dist/resources/32.3b3271a24ac5.css
#	server/client-dist/resources/33.a6e1759ff90b.css
#	server/client-dist/resources/33.e0da05c0.js
#	server/client-dist/resources/37.9142c7ae.js
#	server/client-dist/resources/38.16271e85.js
#	server/client-dist/resources/39.4ee09ab0.js
#	server/client-dist/resources/40.821d375e.js
#	server/client-dist/resources/41.a220c198.js
#	server/client-dist/resources/app~e2e93592.f5c571558913.css
#	server/client-dist/resources/login-left-bg.1a456b4f.png
#	server/client-dist/resources/logo.2d35bcc8.png
#	server/client-dist/resources/vendor~1f20a385.60735a52.js
#	server/client-dist/resources/vendor~6ed3fd28.f4de2a37.js
#	server/client-dist/resources/vendor~7274e1de.28ab7297.js
#	server/client-dist/resources/vendor~77bf5e45.d33c01d5.js
#	server/client-dist/resources/vendor~db300d2f.9020df4a.js
#	server/client-dist/resources/vendor~fdc6512a.9f4cdccc.js
#	server/package.json