fix conflicts

This commit is contained in:
Matias Alejo Garcia 2014-05-01 11:04:21 -03:00
commit 84637bd12d
3 changed files with 8 additions and 5 deletions

View file

@ -144,6 +144,9 @@ describe('Wallet model', function() {
var l = w.getAddressesStr();
for (var i=0; i<l.length; i++)
w.addressIsOwn(l[i]).should.equal(true);
w.addressIsOwn(l[0], {excludeMain:true}).should.equal(false);
w.addressIsOwn('mmHqhvTVbxgJTnePa7cfweSRjBCy9bQQXJ').should.equal(false);
w.addressIsOwn('mgtUfP9sTJ6vPLoBxZLPEccGpcjNVryaCX').should.equal(false);
});