RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #517 from tj-bitpay/fix-merge-conflicts

Browse Source 
revert merge conflicts from last PR
This commit is contained in:
Alex 2017-08-09 14:53:07 -04:00 committed by GitHub
commit 613cf6ebfb
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/services/p2p/index.js
View File

@ -332,16 +332,10 @@ P2P.prototype._setResourceFilter = function(filter, resource) {
}; };
<<<<<<< HEAD
P2P.prototype._startBcoin = function(callback) { P2P.prototype._startBcoin = function(callback) {
var self = this; var self = this;
const network = ['livenet', 'live', 'main', 'mainnet'].indexOf(this.node.network) !== -1? 'main' : 'testnet'; const network = ['livenet', 'live', 'main', 'mainnet'].indexOf(this.node.network) !== -1? 'main' : 'testnet';
self._bcoin = new Bcoin({ 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, network: network,
prefix: self.node.datadir, prefix: self.node.datadir,
port: 48333 port: 48333