resolved conflict
This commit is contained in:
parent
8d60a4a353
commit
baf92d4c1b
5 changed files with 72 additions and 89 deletions
|
|
@ -16,7 +16,6 @@ var defaultConfig = {
|
|||
limits: {
|
||||
totalCopayers: 12,
|
||||
mPlusN: 100,
|
||||
minAmountSatoshi: 5400,
|
||||
},
|
||||
|
||||
// network layer config
|
||||
|
|
@ -66,4 +65,4 @@ var defaultConfig = {
|
|||
verbose: 1,
|
||||
};
|
||||
if (typeof module !== 'undefined')
|
||||
module.exports = defaultConfig;
|
||||
module.exports = defaultConfig;
|
||||
Loading…
Add table
Add a link
Reference in a new issue