From ffc44db08549ff06db2c6612be947d66bc2dd318 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Mon, 13 Nov 2017 14:07:39 -0500
Subject: [PATCH] fix #807: cloud-merging not supported

---
 src/cloud-ui.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cloud-ui.html b/src/cloud-ui.html
index 3053d7a..9f2de2b 100644
--- a/src/cloud-ui.html
+++ b/src/cloud-ui.html
@@ -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">