Fix invalid character on Claimable

02f7f4c4 · AugustoL · 423cec41 · 02f7f4c4
Commit 02f7f4c4 authored Dec 15, 2016 by AugustoL
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Claimable.sol contracts/Claimable.sol +0 -4

No files found.
--- a/contracts/Claimable.sol
+++ b/contracts/Claimable.sol
-<<<<<<< HEAD
 pragma solidity ^0.4.0;


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