mirror of
https://github.com/aniyomiorg/aniyomi.git
synced 2024-11-29 01:29:02 +03:00
merge pr7 2.0
This commit is contained in:
parent
00a5105c4f
commit
91bc2db7b9
1 changed files with 0 additions and 3 deletions
|
@ -115,11 +115,8 @@ object PreferenceKeys {
|
|||
|
||||
const val folderPerManga = "create_folder_per_manga"
|
||||
|
||||
<<<<<<< HEAD
|
||||
const val folderPerAnime = "create_folder_per_anime"
|
||||
|
||||
=======
|
||||
>>>>>>> 60f18f3b5a254a0cf3d590af146df75069a0c03c
|
||||
const val numberOfBackups = "backup_slots"
|
||||
|
||||
const val backupInterval = "backup_interval"
|
||||
|
|
Loading…
Reference in a new issue