remove @types/web3

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "commons",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -271,15 +271,9 @@
       "dev": true
     },
     "@types/node": {
-<<<<<<< HEAD
-      "version": "11.13.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.7.tgz",
-      "integrity": "sha512-suFHr6hcA9mp8vFrZTgrmqW2ZU3mbWsryQtQlY/QvwTISCw7nw/j+bCQPPohqmskhmqa5wLNuMHTTsc+xf1MQg==",
-=======
       "version": "11.13.5",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.5.tgz",
       "integrity": "sha512-/OMMBnjVtDuwX1tg2pkYVSqRIDSmNTnvVvmvP/2xiMAAWf4a5+JozrApCrO4WCAILmXVxfNoQ3E+0HJbNpFVGg==",
->>>>>>> package-locks, web3 import
       "dev": true
     },
     "@types/unist": {
@@ -7770,17 +7764,6 @@
             "caniuse-lite": "^1.0.30000960",
             "electron-to-chromium": "^1.3.124",
             "node-releases": "^1.1.14"
-<<<<<<< HEAD
-          },
-          "dependencies": {
-            "caniuse-lite": {
-              "version": "1.0.30000962",
-              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000962.tgz",
-              "integrity": "sha512-WXYsW38HK+6eaj5IZR16Rn91TGhU3OhbwjKZvJ4HN/XBIABLKfbij9Mnd3pM0VEwZSlltWjoWg3I8FQ0DGgNOA==",
-              "dev": true
-            }
-=======
->>>>>>> package-locks, web3 import
           }
         },
         "camelcase": {

server/package-lock.json

@@ -419,15 +419,6 @@
         "@babel/types": "^7.3.0"
       }
     },
-    "@types/bn.js": {
-      "version": "4.11.5",
-      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.5.tgz",
-      "integrity": "sha512-AEAZcIZga0JgVMHNtl1CprA/hXX7/wPt79AgR4XqaDt7jyj3QWYw6LPoOiznPtugDmlubUnAahMs2PFxGcQrng==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/body-parser": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz",
@@ -595,22 +586,6 @@
       "integrity": "sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==",
       "dev": true
     },
-    "@types/underscore": {
-      "version": "1.8.14",
-      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.8.14.tgz",
-      "integrity": "sha512-xbzi6UaATVKupInG3D65/EPQ3qkJCvG2ZAzmlIYt6x93ACOEX2Y0fHW4/e8TF3G7q5KB2l7wTZgzfNjyYDMuZw==",
-      "dev": true
-    },
-    "@types/web3": {
-      "version": "1.0.18",
-      "resolved": "https://registry.npmjs.org/@types/web3/-/web3-1.0.18.tgz",
-      "integrity": "sha512-uXQL0LDszt2f476LEmYM6AvSv9F4vU4hWQvlUhwfLHNlIB6OyBXoYsCzWAIhhnc5U0HA7ZBcPybxRJ/yfA6THg==",
-      "dev": true,
-      "requires": {
-        "@types/bn.js": "*",
-        "@types/underscore": "*"
-      }
-    },
     "@types/yargs": {
       "version": "12.0.12",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.12.tgz",

server/package.json

@@ -36,7 +36,6 @@
     "@types/morgan": "^1.7.35",
     "@types/node": "^11.13.4",
     "@types/request": "^2.48.1",
-    "@types/web3": "^1.0.18",
     "jasmine": "^3.4.0",
     "jest": "^24.7.1",
     "nodemon": "^1.18.11",