conflict in package json
This commit is contained in:
parent
90be6125db
commit
bc837848d2
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"editor.tabSize": 2,
|
||||
"workbench.activityBar.visible": true,
|
||||
"editor.minimap.enabled": false
|
||||
}
|
|
@ -17,8 +17,8 @@ class IPC {
|
|||
function connecting(_socket) {
|
||||
let connectedBefore = false, alreadyDisconnected = false;
|
||||
ipc.of['embark'].on('connect',function() {
|
||||
if (!alreadyDisconnected && !connectedBefore) {
|
||||
connectedBefore = true;
|
||||
if (!alreadyDisconnected) {
|
||||
self.connected = true;
|
||||
done();
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -13,6 +13,8 @@
|
|||
"networkType": "custom",
|
||||
"networkId": "1337",
|
||||
"isDev": true,
|
||||
"isDev": false,
|
||||
"genesisBlock": "config/development/genesis.json",
|
||||
"datadir": ".embark/development/datadir",
|
||||
"mineWhenNeeded": true,
|
||||
"nodiscover": true,
|
||||
|
|
Loading…
Reference in New Issue