use neo-blessed

package-lock.json

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