# Conflicts:
#	app/src/main/res/layout/notification_common_small.xml

# Conflicts:
#	app/src/main/java/com/swiftcleaner/chovey/view/activity/StartActivity.java

# Conflicts:
#	app/src/main/java/com/zxdemo/notity/NotificationUtils.kt
#	app/src/main/java/com/zxdemo/utils/GlobalTimer.kt