From 05d8cf521defd69c248ab9307457dc1c4ab82b30 Mon Sep 17 00:00:00 2001
From: Chris Kleeschulte <chrisk@bitpay.com>
Date: Tue, 4 Aug 2015 17:14:27 -0400
Subject: [PATCH] Resolved merge conflict.

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

diff --git a/lib/daemon.js b/lib/daemon.js
index c9cfd2ec..5a3357d4 100644
--- a/lib/daemon.js
+++ b/lib/daemon.js
@@ -7,6 +7,8 @@ var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json
 var bitcoind = require(binding_path);
 var util = require('util');
 var bitcore = require('bitcore');
+var chainlib = require('chainlib');
+var log = chainlib.log;
 var $ = bitcore.util.preconditions;
 
 function Daemon(options) {