Fix invalid character on Claimable

8 years ago · 02f7f4c49d
parent 423cec41e3
commit 02f7f4c49d
1 changed files with 0 additions and 4 deletions
--- a/contracts/Claimable.sol
+++ b/contracts/Claimable.sol
@ -1,10 +1,6 @@
-<<<<<<< HEAD
 pragma solidity ^0.4.0;


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