fix conflics

This commit is contained in:
Matias Alejo Garcia 2014-04-24 23:42:59 -03:00
commit 46fa0e518c
4 changed files with 7 additions and 7 deletions

View file

@ -110,10 +110,10 @@ describe('API', function() {
});
});
describe('#getWalletIds', function() {
describe('#getWallets', function() {
it('should get the wallet ids', function(done) {
var api = new API({Storage: Storage});
api.getWalletIds(function(err, result) {
api.getWallets(function(err, result) {
result.length.should.be.greaterThan(-1);
done();
});