status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

conflict in package json

This commit is contained in:
Jonathan Rainville 2018-06-27 14:32:13 -04:00 committed by Pascal Precht
parent 90be6125db
commit bc837848d2
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
4 changed files with 8 additions and 10499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"editor.tabSize": 2,
"workbench.activityBar.visible": true,
"editor.minimap.enabled": false
}

2
lib/core/ipc.js
View File

@ -17,8 +17,8 @@ class IPC {
function connecting(_socket) { function connecting(_socket) {
let connectedBefore = false, alreadyDisconnected = false; let connectedBefore = false, alreadyDisconnected = false;
ipc.of['embark'].on('connect',function() { ipc.of['embark'].on('connect',function() {
if (!alreadyDisconnected && !connectedBefore) {
connectedBefore = true; connectedBefore = true;
if (!alreadyDisconnected) {
self.connected = true; self.connected = true;
done(); done();
} }

10498
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
test_apps/test_app/config/blockchain.json
View File

@ -13,6 +13,8 @@
"networkType": "custom", "networkType": "custom",
"networkId": "1337", "networkId": "1337",
"isDev": true, "isDev": true,
"isDev": false,
"genesisBlock": "config/development/genesis.json",
"datadir": ".embark/development/datadir", "datadir": ".embark/development/datadir",
"mineWhenNeeded": true, "mineWhenNeeded": true,
"nodiscover": true, "nodiscover": true,