From 02f7f4c49d26e6fafeddf76534d118c2e8d608a1 Mon Sep 17 00:00:00 2001
From: AugustoL <augusto.lemble@gmail.com>
Date: Thu, 15 Dec 2016 21:21:54 -0300
Subject: [PATCH] Fix invalid character on Claimable

---
 contracts/Claimable.sol | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/contracts/Claimable.sol b/contracts/Claimable.sol
index c8bc0c6be..279e3480a 100644
--- 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';