# Conflicts:
#	config.gradle
#	m-user/src/main/AndroidManifest.xml
#	m-user/src/main/java/com/yidianling/user/http/UserApi.kt
#	m-user/src/main/java/com/yidianling/user/mine/AccountSettingActivity.java
#	m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
#	m-user/src/main/java/com/yidianling/user/ui/login/presenter/VerificationCodePresenterImpl.kt