fix #807: cloud-merging not supported

pull/2/head
gorhill 7 years ago
parent 540436fe7f
commit ffc44db085

@ -8,7 +8,7 @@
<button id="cloudPush" type="button" title="cloudPush"></button>
<span data-i18n="cloudNoData"></span>
<button id="cloudPull" type="button" title="cloudPull" disabled></button>
<button id="cloudPullAndMerge" type="button" title="cloudPullAndMerge" disabled></button>
<!-- <button id="cloudPullAndMerge" type="button" title="cloudPullAndMerge" disabled></button> -->
<p id="cloudError"><span></span></p>
<span id="cloudCog" class="fa">&#xf013;</span>
<div id="cloudOptions">

Loading…
Cancel
Save