Funkwhale
/
Kodi.plugin.audio.subsonic
mirror of https://github.com/gordielachance/plugin.audio.subsonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Resolve merge conflict

This commit is contained in:
warwickh 2021-09-09 18:04:37 +10:00 committed by GitHub
parent c4c0aa00c6
commit 8ca52e6cc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/settings.xml
View File

@ -26,12 +26,8 @@
<setting label="30041" id="legacyauth" type="bool" default="false" />
<setting label="30017" type="lsep" />
<setting label="30018" id="cachetime" type="labelenum" default="3600" values="1|5|15|30|60|120|180|720|1440|3600"/>
<<<<<<< HEAD
<setting label="30043" id="merge" type="bool" default="true" />
=======
<setting label="30043" id="merge" type="bool" default="false" />
<setting label="30044" id="scrobble" type="bool" default="false" />
>>>>>>> scrobble
</category>
</settings>