# Conflicts:
#	app/src/main/java/com/zxhy/hfilemanagermaster/duplicate/DupPictureActivity.kt
#	app/src/main/res/layout/activity_internal_storage.xml

# Conflicts:
#	app/src/main/java/com/zxhy/hfilemanagermaster/duplicate/DupPictureActivity.kt
#	app/src/main/java/com/zxhy/hfilemanagermaster/internalstorage/InternalStorageActivity.kt
#	app/src/main/res/layout/activity_internal_storage.xml

# Conflicts:
#	app/src/main/java/com/zxhy/hfilemanagermaster/OverviewActivity.kt
#	app/src/main/res/layout/activity_overview.xml
#	app/src/main/res/layout/fragment_manager.xml
#	app/src/main/res/navigation/nav.xml