
(cherry picked from commit 9f90ee358b8bee6713ef679aef7893f44fcc8f28) # Conflicts: # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt
(cherry picked from commit 9f90ee358b8bee6713ef679aef7893f44fcc8f28) # Conflicts: # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt