
(cherry picked from commit cd16522805eedc73fa3ab0f8db5ee403162a020c) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/MangaRestorer.kt
(cherry picked from commit cd16522805eedc73fa3ab0f8db5ee403162a020c) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/MangaRestorer.kt