DelayedClaimable contract with test added

Renamed DelayedClaimable function and modifier
2016-11-16 19:49:57 -03:00
parent 42ccbb2276
commit c7eb6736ee
1 changed files with 4 additions and 0 deletions
--- a/contracts/Claimable.sol
+++ b/contracts/Claimable.sol
@ -1,6 +1,10 @@
+<<<<<<< HEAD
 pragma solidity ^0.4.0;


+=======
+pragma solidity ^0.4.4;
+>>>>>>> 0aa4d02... DelayedClaimable contract with test added
 import './Ownable.sol';