embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'features/ipfs-process' of https://github.com/embark-framework/embark into features/ipfs-process 

# Conflicts:
#	lib/contracts/blockchain.js
This commit is contained in:
Jonathan Rainville 2018-05-30 12:02:30 -04:00
parent b5d9a86680 d969eb0065
commit ff0d24aa1f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/contracts/blockchain.js
View File

@ -141,6 +141,7 @@ class Blockchain {
if (err && err !== NO_NODE) { if (err && err !== NO_NODE) {
return cb(err); return cb(err);
} }
}
cb(statusObj); cb(statusObj);
}); });
}, 5000, 'off'); }, 5000, 'off');

2
package-lock.json generated
View File

@ -3591,7 +3591,7 @@
"ethereumjs-testrpc": { "ethereumjs-testrpc": {
"version": "6.0.3", "version": "6.0.3",
"resolved": "https://registry.npmjs.org/ethereumjs-testrpc/-/ethereumjs-testrpc-6.0.3.tgz", "resolved": "https://registry.npmjs.org/ethereumjs-testrpc/-/ethereumjs-testrpc-6.0.3.tgz",
"integrity": "sha512-lAxxsxDKK69Wuwqym2K49VpXtBvLEsXr1sryNG4AkvL5DomMdeCBbu3D87UEevKenLHBiT8GTjARwN6Yj039gA==", "integrity": "sha1-eguHvzZw+S9gf5j6aniAHZdBsSQ=",
"requires": { "requires": {
"webpack": "3.11.0" "webpack": "3.11.0"
}, },