Merge tag 'v2.1.1' of github.com:OpenZeppelin/openzeppelin-solidity

v2.1.1
This commit is contained in:
Francisco Giordano
2019-01-18 15:33:51 -03:00
237 changed files with 8562 additions and 4937 deletions

View File

@ -1,16 +1,13 @@
pragma solidity ^0.4.24;
pragma solidity ^0.5.0;
import "../introspection/ERC165.sol";
contract ERC165Mock is ERC165 {
constructor() public {
ERC165.initialize();
}
function registerInterface(bytes4 interfaceId)
public
{
function registerInterface(bytes4 interfaceId) public {
_registerInterface(interfaceId);
}
}