Resolved merge conflict.

2015-08-04 17:14:27 -04:00 · 2015-08-04 17:14:27 -04:00 · 05d8cf521d
parent 9bff9ead78
commit 05d8cf521d
1 changed files with 2 additions and 0 deletions
--- 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) {