mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fix merge conflicts
This commit is contained in:
parent
bcfee41a57
commit
d33230d361
97 changed files with 1205 additions and 811 deletions
|
@ -84,14 +84,6 @@
|
|||
|
||||
return appStorage.getItem('syncOnlyOnWifi') != 'false';
|
||||
},
|
||||
syncLosslessAudio: function (val) {
|
||||
|
||||
if (val != null) {
|
||||
update('syncLosslessAudio', val.toString());
|
||||
}
|
||||
|
||||
return appStorage.getItem('syncLosslessAudio') != 'false';
|
||||
},
|
||||
syncPath: function (val) {
|
||||
|
||||
if (val != null) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue