Commit 31ec824a by Francisco Giordano

Revert "add workaround because truffle doesn't support transitive dependencies"

This reverts commit 48a7cd4e.
parent b732b641
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "../zos-lib/migrations/Migratable.sol";
import "../ownership/Ownable.sol"; import "../ownership/Ownable.sol";
import "../ownership/rbac/RBAC.sol"; import "../ownership/rbac/RBAC.sol";
import "../ECRecovery.sol"; import "../ECRecovery.sol";
/** /**
* @title SignatureBouncer * @title SignatureBouncer
* @author PhABC and Shrugs * @author PhABC and Shrugs
......
pragma solidity ^0.4.21; pragma solidity ^0.4.21;
import "../zos-lib/migrations/Migratable.sol"; import "zos-lib/contracts/migrations/Migratable.sol";
/** /**
......
pragma solidity ^0.4.21; pragma solidity ^0.4.21;
import "./RBAC.sol"; import "./RBAC.sol";
import "../../zos-lib/migrations/Migratable.sol"; import 'zos-lib/contracts/migrations/Migratable.sol';
/** /**
* @title RBACWithAdmin * @title RBACWithAdmin
......
pragma solidity ^0.4.21; pragma solidity ^0.4.21;
import "../math/SafeMath.sol"; import "../math/SafeMath.sol";
import "../zos-lib/migrations/Migratable.sol"; import "zos-lib/contracts/migrations/Migratable.sol";
/** /**
......
pragma solidity ^0.4.21; pragma solidity ^0.4.21;
import "./ERC20.sol"; import "./ERC20.sol";
import "../../zos-lib/migrations/Migratable.sol"; import "zos-lib/contracts/migrations/Migratable.sol";
contract DetailedERC20 is Migratable, ERC20 { contract DetailedERC20 is Migratable, ERC20 {
......
pragma solidity ^0.4.21; pragma solidity ^0.4.21;
import "../../zos-lib/migrations/Migratable.sol"; import "zos-lib/contracts/migrations/Migratable.sol";
import "./DetailedERC20.sol"; import "./DetailedERC20.sol";
import "./MintableToken.sol"; import "./MintableToken.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.21;
import "../../zos-lib/migrations/Migratable.sol"; import "zos-lib/contracts/migrations/Migratable.sol";
import "./DetailedERC20.sol"; import "./DetailedERC20.sol";
import "./MintableToken.sol"; import "./MintableToken.sol";
......
...@@ -2,7 +2,7 @@ pragma solidity ^0.4.21; ...@@ -2,7 +2,7 @@ pragma solidity ^0.4.21;
import "./StandardToken.sol"; import "./StandardToken.sol";
import "../../ownership/Ownable.sol"; import "../../ownership/Ownable.sol";
import "../../zos-lib/migrations/Migratable.sol"; import "zos-lib/contracts/migrations/Migratable.sol";
/** /**
......
pragma solidity ^0.4.21; pragma solidity ^0.4.21;
import "./SafeERC20.sol"; import "./SafeERC20.sol";
import "../../zos-lib/migrations/Migratable.sol"; import "zos-lib/contracts/migrations/Migratable.sol";
/** /**
......
...@@ -6,7 +6,7 @@ import "./ERC20Basic.sol"; ...@@ -6,7 +6,7 @@ import "./ERC20Basic.sol";
import "./SafeERC20.sol"; import "./SafeERC20.sol";
import "../../ownership/Ownable.sol"; import "../../ownership/Ownable.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
import "../../zos-lib/migrations/Migratable.sol"; import "zos-lib/contracts/migrations/Migratable.sol";
/** /**
......
...@@ -2,7 +2,7 @@ pragma solidity ^0.4.21; ...@@ -2,7 +2,7 @@ pragma solidity ^0.4.21;
import "./ERC721.sol"; import "./ERC721.sol";
import "./ERC721BasicToken.sol"; import "./ERC721BasicToken.sol";
import "../../zos-lib/migrations/Migratable.sol"; import "zos-lib/contracts/migrations/Migratable.sol";
/** /**
......
../../../node_modules/zos-lib/contracts/migrations/Migratable.sol
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment