aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-10-09 19:11:55 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-10-09 22:01:34 +0800
commitd21e6f3aaf0ec5bc4e86bee029dc206bb8a586ce (patch)
tree60d9d4e5a794d4703ceeeb2ab38b9fafc340100b
parent22160df2d2d5aef63c3e2c3f502ac15119b18e07 (diff)
downloaddexon-sol-tools-d21e6f3aaf0ec5bc4e86bee029dc206bb8a586ce.tar
dexon-sol-tools-d21e6f3aaf0ec5bc4e86bee029dc206bb8a586ce.tar.gz
dexon-sol-tools-d21e6f3aaf0ec5bc4e86bee029dc206bb8a586ce.tar.bz2
dexon-sol-tools-d21e6f3aaf0ec5bc4e86bee029dc206bb8a586ce.tar.lz
dexon-sol-tools-d21e6f3aaf0ec5bc4e86bee029dc206bb8a586ce.tar.xz
dexon-sol-tools-d21e6f3aaf0ec5bc4e86bee029dc206bb8a586ce.tar.zst
dexon-sol-tools-d21e6f3aaf0ec5bc4e86bee029dc206bb8a586ce.zip
Fix merge conflicts
-rw-r--r--yarn.lock39
1 files changed, 39 insertions, 0 deletions
diff --git a/yarn.lock b/yarn.lock
index 21dcf1148..dc0c1b14d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6480,6 +6480,45 @@ ganache-core@0xProject/ganache-core#monorepo-dep:
merkle-patricia-tree "^2.2.0"
pify "^3.0.0"
prepend-file "^1.3.1"
+ seedrandom "~2.4.2"
+ shebang-loader "0.0.1"
+ solc "0.4.24"
+ temp "^0.8.3"
+ tmp "0.0.31"
+ web3 "^1.0.0-beta.34"
+ web3-provider-engine "^14.0.6"
+ websocket "^1.0.24"
+ yargs "^7.0.2"
+
+ganache-core@^2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/ganache-core/-/ganache-core-2.2.1.tgz#c0125d77d3e28d627a812dd002dac21e1d2cc8b7"
+ dependencies:
+ abstract-leveldown "^3.0.0"
+ async "^2.5.0"
+ bip39 "~2.4.0"
+ bn.js "4.11.6"
+ cachedown "^1.0.0"
+ chai "^3.5.0"
+ clone "^2.1.1"
+ eth-sig-util "^2.0.2"
+ ethereumjs-abi "^0.6.5"
+ ethereumjs-account "~2.0.4"
+ ethereumjs-block "~1.2.2"
+ ethereumjs-tx "1.3.4"
+ ethereumjs-util "^5.2.0"
+ ethereumjs-vm "2.3.5"
+ ethereumjs-wallet "0.6.0"
+ fake-merkle-patricia-tree "~1.0.1"
+ heap "~0.2.6"
+ js-scrypt "^0.2.0"
+ level-sublevel "^6.6.1"
+ levelup "^1.1.0"
+ localstorage-down "^0.6.7"
+ lodash "^4.17.5"
+ merkle-patricia-tree "^2.2.0"
+ pify "^3.0.0"
+ prepend-file "^1.3.1"
request "^2.87.0"
seedrandom "~2.4.2"
shebang-loader "0.0.1"