Skip to content
This repository has been archived by the owner on Jul 21, 2021. It is now read-only.

Commit

Permalink
fix #807: cloud-merging not supported
Browse files Browse the repository at this point in the history
  • Loading branch information
gorhill committed Nov 13, 2017
1 parent 540436f commit ffc44db
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/cloud-ui.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down

0 comments on commit ffc44db

Please sign in to comment.