NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix invalid character on Claimable

Browse Source
This commit is contained in:
AugustoL
2016-12-15 21:21:54 -03:00
parent 423cec41e3
commit 02f7f4c49d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/Claimable.sol
View File

@ -1,10 +1,6 @@
<<<<<<< HEAD
pragma solidity ^0.4.0; pragma solidity ^0.4.0;
=======
pragma solidity ^0.4.4;
>>>>>>> 0aa4d02... DelayedClaimable contract with test added
import './Ownable.sol'; import './Ownable.sol';