Resolve conflicts

2016-10-26 09:05:58 +01:00
parent f2ec8790e8 47b2c6d668
commit a02a8a6e41
1 changed files with 1 additions and 1 deletions
--- a/contracts/bounties/CrowdsaleTokenBounty.sol
+++ b/contracts/bounties/CrowdsaleTokenBounty.sol
@ -5,7 +5,7 @@ import '../token/CrowdsaleToken.sol';
 /*
 * Bounty
 * This bounty will pay out if you can cause a CrowdsaleToken's balance
- * to be lower than its totalSupply, which would mean that it doesn't 
+ * to be lower than its totalSupply, which would mean that it doesn't
 * have sufficient ether for everyone to withdraw.
 */
 contract CrowdsaleTokenBounty is PullPayment {