resolved conflicts

This commit is contained in:
Ivan Socolsky 2014-09-12 10:28:16 -03:00
commit 19a8733a9c
2 changed files with 7 additions and 1 deletions

View file

@ -84,6 +84,8 @@ FakeWallet.prototype.getAddressesInfo = function() {
return ret;
};
FakeWallet.prototype.subscribeToAddresses = function() {};
FakeWallet.prototype.isShared = function() {
return this.totalCopayers > 1;
}