diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-04-10 19:44:15 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-04-12 18:50:38 +0800 |
| commit | f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1 (patch) | |
| tree | 98ff3c9137cdce1a44b65dc7dc89a7a72f70b9de /packages/deployer/test/fixtures | |
| parent | ed0c64fdcf5c180107f54ad916c11c4901a4c01c (diff) | |
| download | dexon-0x-contracts-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.tar dexon-0x-contracts-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.tar.gz dexon-0x-contracts-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.tar.bz2 dexon-0x-contracts-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.tar.lz dexon-0x-contracts-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.tar.xz dexon-0x-contracts-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.tar.zst dexon-0x-contracts-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.zip | |
Revert "Merge pull request #493 from hysz/features/deployer/multipleCodebaseSupport"
This reverts commit 70d403e6f8c56bc70e6d3471a770b9bbff5d72e7, reversing
changes made to 073bf738ddb271b6b4158798baf4cac3cb0608e9.
Diffstat (limited to 'packages/deployer/test/fixtures')
| -rw-r--r-- | packages/deployer/test/fixtures/contracts/Exchange.sol (renamed from packages/deployer/test/fixtures/contracts/main/Exchange.sol) | 6 | ||||
| -rw-r--r-- | packages/deployer/test/fixtures/contracts/TokenTransferProxy.sol (renamed from packages/deployer/test/fixtures/contracts/main/TokenTransferProxy.sol) | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/deployer/test/fixtures/contracts/main/Exchange.sol b/packages/deployer/test/fixtures/contracts/Exchange.sol index ea9ca3afa..1b6819700 100644 --- a/packages/deployer/test/fixtures/contracts/main/Exchange.sol +++ b/packages/deployer/test/fixtures/contracts/Exchange.sol @@ -1,6 +1,6 @@ /* - Copyright 2018 ZeroEx Intl. + Copyright 2017 ZeroEx Intl. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ pragma solidity 0.4.14; import "./TokenTransferProxy.sol"; -import "/base/Token.sol"; -import "/base/SafeMath.sol"; +import "./base/Token.sol"; +import "./base/SafeMath.sol"; /// @title Exchange - Facilitates exchange of ERC20 tokens. /// @author Amir Bandeali - <amir@0xProject.com>, Will Warren - <will@0xProject.com> diff --git a/packages/deployer/test/fixtures/contracts/main/TokenTransferProxy.sol b/packages/deployer/test/fixtures/contracts/TokenTransferProxy.sol index 99d16cb57..90c8e7d66 100644 --- a/packages/deployer/test/fixtures/contracts/main/TokenTransferProxy.sol +++ b/packages/deployer/test/fixtures/contracts/TokenTransferProxy.sol @@ -1,6 +1,6 @@ /* - Copyright 2018 ZeroEx Intl. + Copyright 2017 ZeroEx Intl. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ pragma solidity 0.4.14; -import "/base/Token.sol"; -import "/base/Ownable.sol"; +import "./base/Token.sol"; +import "./base/Ownable.sol"; /// @title TokenTransferProxy - Transfers tokens on behalf of contracts that have been approved via decentralized governance. /// @author Amir Bandeali - <amir@0xProject.com>, Will Warren - <will@0xProject.com> |