# Conflicts:
#	client/client/components/player/rightSide/sideChapterList.vue
#	client/client/project/actions/ChapterAction.js
#	client/client/project/actions/CourseAction.js
#	client/client/project/pages/myLearn/courseDetail.vue
#	server/client-dist/index.html
#	server/client-dist/resources/12.74df2619.js
#	server/client-dist/resources/14.452aabba.js
#	server/client-dist/resources/20.a029dc0f3a68.css
#	server/client-dist/resources/20.d6e890a8.js
#	server/client-dist/resources/21.1781a847a9fa.css
#	server/client-dist/resources/21.e653d57a.js
#	server/client-dist/resources/23.207b7137.js
#	server/client-dist/resources/23.ac46a7f215a5.css
#	server/client-dist/resources/23.ae5610e2.js
#	server/client-dist/resources/23.d0b0367588f8.css
#	server/client-dist/resources/24.ac46a7f215a5.css
#	server/client-dist/resources/24.bcaa4c08.js
#	server/client-dist/resources/26.2c1bb4b4.js
#	server/client-dist/resources/26.dcb1b880.js
#	server/client-dist/resources/27.45cd3e74.js
#	server/client-dist/resources/27.4f93b09f.js
#	server/client-dist/resources/27.8c85fa33.js
#	server/client-dist/resources/28.214150d4.js
#	server/client-dist/resources/6.1f5b7a073162.css
#	server/client-dist/resources/6.3107a8ece89c.css
#	server/client-dist/resources/6.61215dbb.js
#	server/client-dist/resources/6.adf556fa1464.css
#	server/client-dist/resources/app.04dd8c75edb8.css