From 94ceaa18579fd8439bedb130df247c381bae9f02 Mon Sep 17 00:00:00 2001
From: Patrick Nagurny <patrick@bitpay.com>
Date: Mon, 20 Jul 2015 11:27:28 -0600
Subject: [PATCH] fix to rebase conflict issue

---
 lib/daemon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/daemon.js b/lib/daemon.js
index 516c3a3e..5295c925 100644
--- 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();
 };