Resolve conflicts

pull/35/head
Makoto Inoue 8 years ago
commit a02a8a6e41
  1. 2
      contracts/bounties/CrowdsaleTokenBounty.sol

@ -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 {

Loading…
Cancel
Save