# Conflicts:
#	client/src/action/CourseAction.js
#	client/src/action/OtherAction.js
#	client/src/api/base_api.js
#	client/src/api/discuss_api.js
#	client/src/api/other_api.js
#	client/src/components/learnSysLayout/navigation.vue
#	client/src/modules/discuss/src/discuss.vue
#	client/src/pages/learn/courseDetail.vue
#	client/src/pages/mobileLive/list.vue
#	client/src/pages/other/message.vue
#	server/client-dist/index.html
#	server/client-dist/resources/16.7e17fffc.js
#	server/client-dist/resources/18.1a22737b.js
#	server/client-dist/resources/18.c18f36d03c9d.css
#	server/client-dist/resources/19.c09a9305.js
#	server/client-dist/resources/20.d91beff4.js
#	server/client-dist/resources/app~e2e93592.069905d75bcf.css
#	server/client-dist/resources/app~e2e93592.729a32f9005b.css
#	server/client-dist/resources/app~e2e93592.9241dcb659fc.css
#	server/client-dist/resources/manifest.60b6af21.js