# Conflicts:
#	app/src/main/java/com/ydl/component/MainActivity.kt
#	config.gradle
#	m-im/src/main/java/com/yidianling/uikit/business/session/view/ImCommentBannerView.kt
#	m-im/src/main/res_uikit/layout/im_ydl_nim_message_fragment.xml
#	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/http/UserHttp.kt
#	m-user/src/main/java/com/yidianling/user/http/UserHttpImpl.kt
#	m-user/src/main/java/com/yidianling/user/ui/SmsLoginActivity.kt
#	m-user/src/main/java/com/yidianling/user/ui/login/presenter/InputPassWordPresenterImpl.kt
#	m-user/src/main/java/com/yidianling/user/ui/login/presenter/LoginPresenterImpl.kt
#	m-user/src/main/java/com/yidianling/user/ui/login/presenter/VerificationCodePresenterImpl.kt
#	m-user/src/main/res/layout/user_activity_secret.xml
#	m-user/src/main/res/layout/user_dialog_secret.xml
#	m-user/src/xlzx/res/values/colors.xml
#	m-user/src/ydl/res/values/colors.xml
#	ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt
#	ydl-platform/src/main/res/drawable/platform_ydl_common_dialog_sure_btn_ydl_bg.xml