Fix Conflicts:

js/models/core/WalletFactory.js
2014-06-18 10:03:22 -03:00 · 2014-06-18 10:03:22 -03:00 · 21baa103bd
commit 21baa103bd
parent f5aad7bd15 107414ec7e
13 changed files with 346 additions and 137 deletions
--- a/index.html
+++ b/index.html
@ -769,6 +769,9 @@
            </a>
          </div>
        </div>
+        <div class="row text-center small" style="margin-top:20px">
+          <div class="button  radius warning" ng-really-message="Are you sure to delete this wallet from this computer?" ng-really-click="deleteWallet()">Delete this wallet from this computer</div>
+        </div>
      </div>
    </script>