From 6730322784071f9da31cfb0e969b81c8d36fd67d Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
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 | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index a7633e660..86fe14b7e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7487,6 +7487,7 @@
         }
       }
     },
+<<<<<<< develop
 <<<<<<< develop
     "live-plugin-manager-git-fix": {
 <<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
@@ -7507,6 +7508,17 @@
       "requires": {
         "@types/debug": "0.0.30",
         "@types/fs-extra": "5.0.3",
+=======
+<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
+=======
+    "live-plugin-manager-git-fix": {
+      "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==",
+      "requires": {
+        "@types/debug": "0.0.30",
+        "@types/fs-extra": "5.0.2",
+>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
         "@types/lockfile": "1.0.0",
         "@types/node-fetch": "1.6.9",
         "@types/semver": "5.5.0",
@@ -7547,6 +7559,23 @@
             "graceful-fs": "4.1.11"
           }
         },
+<<<<<<< develop
+=======
+        "minipass": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz",
+          "integrity": "sha512-/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==",
+          "requires": {
+            "safe-buffer": "5.1.2",
+            "yallist": "3.0.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        },
+>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
         "tar": {
           "version": "4.4.4",
           "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz",
@@ -7568,8 +7597,12 @@
         }
       }
     },
+<<<<<<< develop
 =======
 >>>>>>> Finally fixed the solc loading issue.
+=======
+>>>>>>> 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
     "load-json-file": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",