fix to rebase conflict issue
This commit is contained in:
parent
a2f271bf03
commit
94ceaa1857
@ -391,7 +391,7 @@ Daemon.prototype.addMempoolUncheckedTransaction = function(txBuffer) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
Daemon.prototype.getInfo = function() {
|
Daemon.prototype.getInfo = function() {
|
||||||
if (bitcoin.stopping) return [];
|
if (daemon.stopping) return [];
|
||||||
return bitcoindjs.getInfo();
|
return bitcoindjs.getInfo();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user