fix to rebase conflict issue

2015-07-20 11:27:28 -06:00 · 2015-07-20 11:27:28 -06:00 · 94ceaa1857
parent a2f271bf03
commit 94ceaa1857
1 changed files with 1 additions and 1 deletions
--- a/lib/daemon.js
+++ b/lib/daemon.js
@ -391,7 +391,7 @@ Daemon.prototype.addMempoolUncheckedTransaction = function(txBuffer) {
 };

 Daemon.prototype.getInfo = function() {
-  if (bitcoin.stopping) return [];
+  if (daemon.stopping) return [];
  return bitcoindjs.getInfo();
 };