Resolve merge conflict
This commit is contained in:
parent
c4c0aa00c6
commit
8ca52e6cc8
|
@ -26,12 +26,8 @@
|
||||||
<setting label="30041" id="legacyauth" type="bool" default="false" />
|
<setting label="30041" id="legacyauth" type="bool" default="false" />
|
||||||
<setting label="30017" type="lsep" />
|
<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"/>
|
<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="30043" id="merge" type="bool" default="false" />
|
||||||
<setting label="30044" id="scrobble" type="bool" default="false" />
|
<setting label="30044" id="scrobble" type="bool" default="false" />
|
||||||
>>>>>>> scrobble
|
|
||||||
|
|
||||||
</category>
|
</category>
|
||||||
</settings>
|
</settings>
|
||||||
|
|
Loading…
Reference in New Issue