# Conflicts:
#	learnOnline/apiService/ChapterApi.js
#	learnOnline/apiService/CourseApi.js
#	learnOnline/apiService/DiscussApi.js
#	learnOnline/apiService/MsgApi.js
#	learnOnline/apiService/ScoreApi.js
#	learnOnline/pages/index/bindPhone/bindPhone.js
#	learnOnline/utils/util.js