# Conflicts:
#	app/src/main/java/com/bonait/bnframework/business/ConfigData.java

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/bonait/bnframework/business/ConfigData.java

# Conflicts:
#	app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java

# Conflicts:
#	app/src/main/java/com/bonait/bnframework/business/YJDeviceHelper.java
#	app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java