diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-29 17:34:38 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-29 17:34:38 +0800 |
| commit | aa2616b307d3384791f1dbafc76999e7c4cf801f (patch) | |
| tree | 0d8f11f66dcd595fefb184dd0dabc2d69183b782 /yarn.lock | |
| parent | 3062c18ebda8e55831038f140313000fd6d2cf71 (diff) | |
| parent | 518a2da0275632a5dd61f99a105163ff5a074927 (diff) | |
| download | dexon-0x-contracts-aa2616b307d3384791f1dbafc76999e7c4cf801f.tar.gz dexon-0x-contracts-aa2616b307d3384791f1dbafc76999e7c4cf801f.tar.zst dexon-0x-contracts-aa2616b307d3384791f1dbafc76999e7c4cf801f.zip | |
Merge v2-prototype
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -46,7 +46,11 @@ "@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" |