# Conflicts:
#	build.gradle
#	m-user/src/main/java/com/yidianling/user/mine/MineFragment.kt