# Conflicts:
#	config.gradle
#	m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
#	m-audioim/src/main/java/com/ydl/consultantim/ConsultantAudioHomeActivity.kt
#	m-confide/src/main/java/com/ydl/confide/home/bean/ConfideConnectResponse.kt
#	m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt
#	m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt