Fabio Berger 1d9408a8e0 Fix additional merge conflicts

2018-08-14 14:39:59 -07:00

..

chai_setup.ts

Add missing type definitions

2018-05-14 10:35:13 +02:00

simple_erc20_balance_and_proxy_allowance_fetcher.ts

Fix tslint issues

2018-07-17 12:59:02 +02:00

test_order_factory.ts

Fix additional merge conflicts

2018-08-14 14:39:59 -07:00

web3_wrapper.ts

Try enabling no-unused-variable...

2018-06-04 19:48:21 -07:00