fix conflics

This commit is contained in:
Matias Alejo Garcia 2014-06-17 16:25:38 -03:00
commit cd71ce4421
25 changed files with 268 additions and 122 deletions

View file

@ -5,6 +5,7 @@ var FakeWallet = function() {
this.balanceByAddr = {
'1CjPR7Z5ZSyWk6WtXvSFgkptmpoi4UM9BC': 1000
};
this.name = 'myTESTwullet';
};
FakeWallet.prototype.set = function(balance, safeBalance, balanceByAddr) {