aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-11-12 05:11:40 +0800
committerFabio Berger <me@fabioberger.com>2018-11-12 05:11:40 +0800
commit498be7ac41de8f23a33d6cbe84a2e56f0098c752 (patch)
tree26a87b5d8e7d35e3d0023b07dfb2b6db9f240ad1
parent0391f93490cffdc69f6cb32f11762d174ed04e37 (diff)
downloaddexon-sol-tools-498be7ac41de8f23a33d6cbe84a2e56f0098c752.tar
dexon-sol-tools-498be7ac41de8f23a33d6cbe84a2e56f0098c752.tar.gz
dexon-sol-tools-498be7ac41de8f23a33d6cbe84a2e56f0098c752.tar.bz2
dexon-sol-tools-498be7ac41de8f23a33d6cbe84a2e56f0098c752.tar.lz
dexon-sol-tools-498be7ac41de8f23a33d6cbe84a2e56f0098c752.tar.xz
dexon-sol-tools-498be7ac41de8f23a33d6cbe84a2e56f0098c752.tar.zst
dexon-sol-tools-498be7ac41de8f23a33d6cbe84a2e56f0098c752.zip
update yarn.lock
-rw-r--r--yarn.lock19
1 files changed, 2 insertions, 17 deletions
diff --git a/yarn.lock b/yarn.lock
index 32f998a5a..b23ec92d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1906,13 +1906,10 @@ aes-js@^0.2.3:
version "0.2.4"
resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-0.2.4.tgz#94b881ab717286d015fa219e08fb66709dda5a3d"
-<<<<<<< HEAD
-=======
aes-js@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.1.tgz#89fd1f94ae51b4c72d62466adc1a7323ff52f072"
->>>>>>> development
agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
version "4.2.1"
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
@@ -3350,7 +3347,7 @@ bs-logger@0.x:
dependencies:
fast-json-stable-stringify "^2.0.0"
-bs58@=4.0.1:
+bs58@=4.0.1, bs58@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
dependencies:
@@ -3373,8 +3370,6 @@ bs58check@^1.0.8:
bs58 "^3.1.0"
create-hash "^1.1.0"
-<<<<<<< HEAD
-=======
bs58check@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc"
@@ -3383,7 +3378,6 @@ bs58check@^2.1.2:
create-hash "^1.1.0"
safe-buffer "^5.1.2"
->>>>>>> development
bser@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -5971,8 +5965,6 @@ ethereumjs-wallet@0.6.0:
utf8 "^2.1.1"
uuid "^2.0.1"
-<<<<<<< HEAD
-=======
ethereumjs-wallet@~0.6.0:
version "0.6.2"
resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.2.tgz#67244b6af3e8113b53d709124b25477b64aeccda"
@@ -5986,7 +5978,6 @@ ethereumjs-wallet@~0.6.0:
utf8 "^3.0.0"
uuid "^3.3.2"
->>>>>>> development
ethers@~4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.4.tgz#d3f85e8b27f4b59537e06526439b0fb15b44dc65"
@@ -6795,7 +6786,7 @@ ganache-core@0xProject/ganache-core#monorepo-dep:
ethereumjs-tx "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default"
ethereumjs-util "^5.2.0"
ethereumjs-vm "2.3.5"
- ethereumjs-wallet "~0.6.0"
+ ethereumjs-wallet "0.6.0"
fake-merkle-patricia-tree "~1.0.1"
heap "~0.2.6"
js-scrypt "^0.2.0"
@@ -7520,8 +7511,6 @@ hdkey@^0.7.0, hdkey@^0.7.1:
coinstring "^2.0.0"
secp256k1 "^3.0.1"
-<<<<<<< HEAD
-=======
hdkey@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-1.1.0.tgz#e74e7b01d2c47f797fa65d1d839adb7a44639f29"
@@ -7530,7 +7519,6 @@ hdkey@^1.0.0:
safe-buffer "^5.1.1"
secp256k1 "^3.0.1"
->>>>>>> development
he@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
@@ -15617,13 +15605,10 @@ utf8@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96"
-<<<<<<< HEAD
-=======
utf8@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1"
->>>>>>> development
util-deprecate@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"