anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix conflics

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
API.js
View file

@ -169,13 +169,13 @@ API.prototype.getCommands = decorate('getCommands', [
['callback', 'function']
]);
API.prototype._cmd_getWalletIds = function(callback) {
API.prototype._cmd_getWallets = function(callback) {
var self = this;
return callback(null, self.walletFactory.getWalletIds());
return callback(null, self.walletFactory.getWallets());
};
API.prototype.getWalletIds = decorate('getWalletIds', [
API.prototype.getWallets = decorate('getWallets', [
['callback', 'function']
]);