# Conflicts:
#	m-course/src/main/java/com/yidianling/course/MyCourseListFragment.java
#	m-course/src/main/java/com/yidianling/course/courseNew/CourseHeadPagerAdapter.java
#	m-course/src/main/java/com/yidianling/course/courseNew/CourseTopicActivity.kt
#	m-course/src/main/java/com/yidianling/course/courseNew/home/CourseHomeFragment.kt
#	m-course/src/main/java/com/yidianling/course/courseNew/sections/CategorySection.java
#	m-course/src/main/java/com/yidianling/course/courseNew/sections/ClassifiedCourseSection.java
#	m-course/src/main/java/com/yidianling/course/courseNew/sections/QulityCourseSection.java
#	m-course/src/main/java/com/yidianling/course/courseNew/sections/TopicsCoursesSection.java
#	settings.gradle