diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:45:48 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:45:48 +0800 |
| commit | 20f93185975d16c77492f05eb86dd89695539cd9 (patch) | |
| tree | 37b0380cbe98b8a44a350232d4125a1cc77b06b0 /.gitignore | |
| parent | b646c8441467212e60f03c868a55d6ab70720aba (diff) | |
| parent | 9bc6ebde4e4425799ed3ddfb50495029865e3ae8 (diff) | |
| download | dexon-0x-contracts-20f93185975d16c77492f05eb86dd89695539cd9.tar dexon-0x-contracts-20f93185975d16c77492f05eb86dd89695539cd9.tar.gz dexon-0x-contracts-20f93185975d16c77492f05eb86dd89695539cd9.tar.bz2 dexon-0x-contracts-20f93185975d16c77492f05eb86dd89695539cd9.tar.lz dexon-0x-contracts-20f93185975d16c77492f05eb86dd89695539cd9.tar.xz dexon-0x-contracts-20f93185975d16c77492f05eb86dd89695539cd9.tar.zst dexon-0x-contracts-20f93185975d16c77492f05eb86dd89695539cd9.zip | |
Merge branch 'v2-prototype' into feature/combinatorial-testing
* v2-prototype:
Fix linter issue
Fix linter issue
Fix tslint issues
Fix missing paths
Fixed path
Use source-map-support package to include correct line numbers in mocha
move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 73b18e3f4..ed7a7b252 100644 --- a/.gitignore +++ b/.gitignore @@ -80,8 +80,8 @@ packages/order-watcher/test/artifacts/ packages/contract-wrappers/test/artifacts/ # generated contract wrappers -packages/0x.js/src/contract_wrappers/generated/ -packages/contracts/src/contract_wrappers/generated/ +packages/0x.js/src/generated_contract_wrappers/ +packages/contracts/src/generated_contract_wrappers/ packages/contract-wrappers/src/contract_wrappers/generated/ packages/metacoin/src/contract_wrappers packages/fill-scenarios/src/generated_contract_wrappers/ |