# Conflicts:
#	settings.gradle

# Conflicts:
#	RvClient/src/main/java/com/test/rv/MainActivity.java

# Conflicts:
#	RvHome/src/main/java/com/rv/home/rv/wxapi/WXEntryActivity.java