# Conflicts:
#	app/src/main/java/com/ydl/component/MainActivity.kt
#	build.gradle
#	m-im/build.gradle
#	m-im/src/main/java/com/yidianling/im/helper/NimUICallInit.java
#	m-muse/build.gradle
#	settings.gradle
#	ydl-media/build.gradle