From 54130ce77bb94e48bffa5a23398d3668c513e286 Mon Sep 17 00:00:00 2001
From: Thomas Bright <thomasbright@Thomass-iMac.local>
Date: Wed, 9 Aug 2017 14:32:26 -0400
Subject: [PATCH] fixed merge conflicts

---
 lib/services/p2p/index.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/services/p2p/index.js b/lib/services/p2p/index.js
index ae178887..edaecfb0 100644
--- a/lib/services/p2p/index.js
+++ b/lib/services/p2p/index.js
@@ -332,16 +332,10 @@ P2P.prototype._setResourceFilter = function(filter, resource) {
 
 };
 
-<<<<<<< HEAD
 P2P.prototype._startBcoin = function(callback) {
   var self = this;
   const network = ['livenet', 'live', 'main', 'mainnet'].indexOf(this.node.network) !== -1? 'main' : 'testnet';
   self._bcoin = new Bcoin({
-=======
-P2P.prototype._startBcoin = function() {
-  var network = ['livenet', 'live', 'main', 'mainnet'].indexOf(this.node.network) !== -1? 'main' : 'testnet';
-  this._bcoin = new Bcoin({
->>>>>>> 8811190de0a9e09baef7e63d85e065e72b9da8a4
     network: network,
     prefix: self.node.datadir,
     port: 48333