From 5f839a829bd466ae41ef68dad20bd294f8a427ed Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Wed, 13 Jun 2018 09:05:51 -0400 Subject: [PATCH] point to a forked npm package (for now), to avoid the npm install issues some users are reporting --- package-lock.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package-lock.json b/package-lock.json index 59853bf0f..b18a6e5d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7153,9 +7153,15 @@ } }, "live-plugin-manager-git-fix": { +<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue "version": "0.12.1", "resolved": "https://registry.npmjs.org/live-plugin-manager-git-fix/-/live-plugin-manager-git-fix-0.12.1.tgz", "integrity": "sha512-1FvmI3xP246iNgwMcdqlAdPfGhugwiKQhQwg8YY8Uzbzra47lXVpgk3Fe/YDVBRpnnBTQ2YKdDlq4WM86G41SA==", +======= + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/live-plugin-manager-git-fix/-/live-plugin-manager-git-fix-0.12.0.tgz", + "integrity": "sha512-2T5XLjlzPfbvAO1d4U2QvcG/YEewWTqG4GEX5GNQB3rEuHQ/YA3ChwylBbEIC/7Ase4h0vpRER60PJHgjn8/3A==", +>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting "requires": { "@types/debug": "0.0.30", "@types/fs-extra": "5.0.3",