mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-29 09:39:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

merge pr7 2.0

Browse source
This commit is contained in:
jmir1 2021-04-29 16:23:07 +02:00
parent 00a5105c4f
commit 91bc2db7b9
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
View file

@ -115,11 +115,8 @@ object PreferenceKeys {
const val folderPerManga = "create_folder_per_manga" const val folderPerManga = "create_folder_per_manga"
<<<<<<< HEAD
const val folderPerAnime = "create_folder_per_anime" const val folderPerAnime = "create_folder_per_anime"
=======
>>>>>>> 60f18f3b5a254a0cf3d590af146df75069a0c03c
const val numberOfBackups = "backup_slots" const val numberOfBackups = "backup_slots"
const val backupInterval = "backup_interval" const val backupInterval = "backup_interval"