crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Greg Hysen
2019-12-03 16:01:30 -08:00
parent f19f4310f4
commit 54afc8a4a1
7 changed files with 97 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/asset-proxy/test/wrappers.ts
View File

@@ -3,12 +3,8 @@
* Warning: This file is auto-generated by contracts-gen. Don't edit manually.
* -----------------------------------------------------------------------------
*/
<<<<<<< HEAD
export * from '../test/generated-wrappers/chai_bridge';
export * from '../test/generated-wrappers/dy_dx_bridge';
=======
export * from '../test/generated-wrappers/dydx_bridge';
>>>>>>> ee82a0f67... Consistent capitalization for "dydx"`
export * from '../test/generated-wrappers/erc1155_proxy';
export * from '../test/generated-wrappers/erc20_bridge_proxy';
export * from '../test/generated-wrappers/erc20_proxy';
@@ -18,16 +14,9 @@ export * from '../test/generated-wrappers/i_asset_data';
export * from '../test/generated-wrappers/i_asset_proxy';
export * from '../test/generated-wrappers/i_asset_proxy_dispatcher';
export * from '../test/generated-wrappers/i_authorizable';
<<<<<<< HEAD
export * from '../test/generated-wrappers/i_chai';
export * from '../test/generated-wrappers/i_dy_dx';
=======
export * from '../test/generated-wrappers/i_dydx';
<<<<<<< HEAD
>>>>>>> ee82a0f67... Consistent capitalization for "dydx"`
=======
export * from '../test/generated-wrappers/i_dydx_bridge';
>>>>>>> 5e2de489d... Updating bridge to work w/o MAP
export * from '../test/generated-wrappers/i_erc20_bridge';
export * from '../test/generated-wrappers/i_eth2_dai';
export * from '../test/generated-wrappers/i_kyber_network_proxy';
@@ -40,6 +29,7 @@ export * from '../test/generated-wrappers/multi_asset_proxy';
export * from '../test/generated-wrappers/ownable';
export * from '../test/generated-wrappers/static_call_proxy';
export * from '../test/generated-wrappers/test_chai_bridge';
export * from '../test/generated-wrappers/test_dydx_bridge';
export * from '../test/generated-wrappers/test_erc20_bridge';
export * from '../test/generated-wrappers/test_eth2_dai_bridge';
export * from '../test/generated-wrappers/test_kyber_bridge';