Resolve conflicts

This commit is contained in:
Makoto Inoue
2016-10-26 09:05:58 +01:00

View File

@ -5,7 +5,7 @@ import '../token/CrowdsaleToken.sol';
/* /*
* Bounty * Bounty
* This bounty will pay out if you can cause a CrowdsaleToken's balance * 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. * have sufficient ether for everyone to withdraw.
*/ */
contract CrowdsaleTokenBounty is PullPayment { contract CrowdsaleTokenBounty is PullPayment {