From c9ad938c9ae80fb6b52ce62f45b9c61c0fc35c66 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Fri, 15 Jun 2018 17:43:25 -0400
Subject: [PATCH] fix package lock

---
 package-lock.json | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad732036..313a9194 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,11 +50,7 @@
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.3.tgz",
       "integrity": "sha512-m2QKoRrJnei1s10e1ZfMIa7QcABBVLdQhVUv5+bMRaHhPzxO/IWMmREiags59AqFbI+piWPq/PupTahNS/0kyA==",
       "requires": {
-<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
         "@types/node": "10.3.3"
-=======
-        "@types/node": "10.3.2"
->>>>>>> use neo-blessed
       }
     },
     "@types/lockfile": {
@@ -63,26 +59,16 @@
       "integrity": "sha512-pD6JuijPmrfi84qF3/TzGQ7zi0QIX+d7ZdetD6jUA6cp+IsCzAquXZfi5viesew+pfpOTIdAVKuh1SHA7KeKzg=="
     },
     "@types/node": {
-<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
       "version": "10.3.3",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-10.3.3.tgz",
       "integrity": "sha512-/gwCgiI2e9RzzZTKbl+am3vgNqOt7a9fJ/uxv4SqYKxenoEDNVU3KZEadlpusWhQI0A0dOrZ0T68JYKVjzmgdQ=="
-=======
-      "version": "10.3.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.3.2.tgz",
-      "integrity": "sha512-9NfEUDp3tgRhmoxzTpTo+lq+KIVFxZahuRX0LHF/9IzKHaWuoWsIrrJ61zw5cnnlGINX8lqJzXYfQTOICS5Q+A=="
->>>>>>> use neo-blessed
     },
     "@types/node-fetch": {
       "version": "1.6.9",
       "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-1.6.9.tgz",
       "integrity": "sha512-n2r6WLoY7+uuPT7pnEtKJCmPUGyJ+cbyBR8Avnu4+m1nzz7DwBVuyIvvlBzCZ/nrpC7rIgb3D6pNavL7rFEa9g==",
       "requires": {
-<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
         "@types/node": "10.3.3"
-=======
-        "@types/node": "10.3.2"
->>>>>>> use neo-blessed
       }
     },
     "@types/semver": {
@@ -95,11 +81,7 @@
       "resolved": "https://registry.npmjs.org/@types/tar/-/tar-4.0.0.tgz",
       "integrity": "sha512-YybbEHNngcHlIWVCYsoj7Oo1JU9JqONuAlt1LlTH/lmL8BMhbzdFUgReY87a05rY1j8mfK47Del+TCkaLAXwLw==",
       "requires": {
-<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
         "@types/node": "10.3.3"
-=======
-        "@types/node": "10.3.2"
->>>>>>> use neo-blessed
       }
     },
     "@types/url-join": {