(cherry picked from commit 6dab94a9371ad3eac0488c5f105e8e38c6c4e232) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt
(cherry picked from commit 6dab94a9371ad3eac0488c5f105e8e38c6c4e232) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt