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

use neo-blessed

This commit is contained in:
Iuri Matias 2018-06-13 11:17:55 -04:00
parent 4100ab87e0
commit 16cb513e34
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
package-lock.json generated
View File

@ -41,6 +41,11 @@
} }
}, },
<<<<<<< develop <<<<<<< develop
<<<<<<< develop
=======
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
=======
>>>>>>> use neo-blessed
"@types/debug": { "@types/debug": {
"version": "0.0.30", "version": "0.0.30",
"resolved": "https://registry.npmjs.org/@types/debug/-/debug-0.0.30.tgz", "resolved": "https://registry.npmjs.org/@types/debug/-/debug-0.0.30.tgz",
@ -108,8 +113,12 @@
"resolved": "https://registry.npmjs.org/@types/url-join/-/url-join-0.8.2.tgz", "resolved": "https://registry.npmjs.org/@types/url-join/-/url-join-0.8.2.tgz",
"integrity": "sha1-EYHsvh2XtwNODqHjXmLobMJrQi0=" "integrity": "sha1-EYHsvh2XtwNODqHjXmLobMJrQi0="
}, },
<<<<<<< develop
======= =======
>>>>>>> Finally fixed the solc loading issue. >>>>>>> Finally fixed the solc loading issue.
=======
>>>>>>> use neo-blessed
>>>>>>> use neo-blessed
"abbrev": { "abbrev": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@ -5117,9 +5126,9 @@
"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=" "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
}, },
"ganache-cli": { "ganache-cli": {
"version": "6.1.0", "version": "6.1.2",
"resolved": "https://registry.npmjs.org/ganache-cli/-/ganache-cli-6.1.0.tgz", "resolved": "https://registry.npmjs.org/ganache-cli/-/ganache-cli-6.1.2.tgz",
"integrity": "sha512-FdTeyk4uLRHGeFiMe+Qnh4Hc5KiTVqvRVVvLDFJEVVKC1P1yHhEgZeh9sp1KhuvxSrxToxgJS25UapYQwH4zHw==", "integrity": "sha512-nnJ7Gz9dqpLglVqg6KRg+e5ifUhEW4l+BN58du3AKLUEPUVp/kP8YeRWBqjtk5P7ECh6Limj9aGfI3pRslr3Rw==",
"requires": { "requires": {
"source-map-support": "0.5.6", "source-map-support": "0.5.6",
"webpack-cli": "2.1.5" "webpack-cli": "2.1.5"
@ -7517,8 +7526,12 @@
"integrity": "sha512-1FvmI3xP246iNgwMcdqlAdPfGhugwiKQhQwg8YY8Uzbzra47lXVpgk3Fe/YDVBRpnnBTQ2YKdDlq4WM86G41SA==", "integrity": "sha512-1FvmI3xP246iNgwMcdqlAdPfGhugwiKQhQwg8YY8Uzbzra47lXVpgk3Fe/YDVBRpnnBTQ2YKdDlq4WM86G41SA==",
"requires": { "requires": {
"@types/debug": "0.0.30", "@types/debug": "0.0.30",
<<<<<<< develop
"@types/fs-extra": "5.0.2", "@types/fs-extra": "5.0.2",
>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting >>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
=======
"@types/fs-extra": "5.0.3",
>>>>>>> use neo-blessed
"@types/lockfile": "1.0.0", "@types/lockfile": "1.0.0",
"@types/node-fetch": "1.6.9", "@types/node-fetch": "1.6.9",
"@types/semver": "5.5.0", "@types/semver": "5.5.0",
@ -7560,6 +7573,7 @@
} }
}, },
<<<<<<< develop <<<<<<< develop
<<<<<<< develop
======= =======
"minipass": { "minipass": {
"version": "2.3.3", "version": "2.3.3",
@ -7576,6 +7590,8 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
}, },
>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting >>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
=======
>>>>>>> use neo-blessed
"tar": { "tar": {
"version": "4.4.4", "version": "4.4.4",
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz", "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz",