# Conflicts:
#	build.zip
#	client-dist/index.html
#	client-dist/resources/app.515134a0.js
#	client-dist/resources/manifest.65198274.js
#	client-dist/resources/manifest.a8c4ea56.js
#	client-dist/resources/manifest.be6e2083.js

# Conflicts:
#	build.zip
#	client-dist/index.html
#	client-dist/resources/manifest.8d9174ca.js

修改 周作业 + 问题 去掉 附件  - 选修课 没有 课后作业一说
没有 课后测试题 随机

# Conflicts:
#	build.zip
#	client-dist/index.html
#	client-dist/resources/manifest.1aad7850.js
#	client-dist/resources/manifest.8aebf7e8.js
#	client-dist/resources/manifest.f5ee8dee.js

# Conflicts:
#	build.zip
#	client-dist/index.html
#	client-dist/resources/app.276ffb3550e5.css
#	client-dist/resources/app.68a82e13.js
#	client-dist/resources/manifest.b163f7cd.js

# Conflicts:
#	build.zip
#	client-dist/index.html