diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-29 17:40:05 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-29 17:40:05 +0800 |
| commit | 68c00976f137e2014c2efe6f849cef279a529114 (patch) | |
| tree | 3c1dbfc640f598b7f09b630a5531a026c2f52db0 | |
| parent | aa2616b307d3384791f1dbafc76999e7c4cf801f (diff) | |
| download | dexon-sol-tools-68c00976f137e2014c2efe6f849cef279a529114.tar dexon-sol-tools-68c00976f137e2014c2efe6f849cef279a529114.tar.gz dexon-sol-tools-68c00976f137e2014c2efe6f849cef279a529114.tar.bz2 dexon-sol-tools-68c00976f137e2014c2efe6f849cef279a529114.tar.lz dexon-sol-tools-68c00976f137e2014c2efe6f849cef279a529114.tar.xz dexon-sol-tools-68c00976f137e2014c2efe6f849cef279a529114.tar.zst dexon-sol-tools-68c00976f137e2014c2efe6f849cef279a529114.zip | |
Fix merge
| -rw-r--r-- | yarn.lock | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -46,11 +46,7 @@ "@0xproject/order-watcher@^0.0.6": version "0.0.6" -<<<<<<< HEAD - resolved "https://registry.yarnpkg.com/@0xproject/order-watcher/-/order-watcher-0.0.6.tgz#85a8fb21e5755bb555f427b12d64d10b89b332e6" -======= resolved "https://registry.npmjs.org/@0xproject/order-watcher/-/order-watcher-0.0.6.tgz#85a8fb21e5755bb555f427b12d64d10b89b332e6" ->>>>>>> v2-prototype dependencies: "@0xproject/assert" "^0.2.12" "@0xproject/base-contract" "^0.3.4" |