Skip to content

Fix version error for truffle-flattener. #794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 16, 2018
Merged

Fix version error for truffle-flattener. #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9b2e47
Fix version error for truffle-flattener.
artiya4u Mar 6, 2018
3e9022d
Merge branch 'master' into master
shrugs Mar 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^ 0.4.18;
pragma solidity ^0.4.18;

import "../../math/SafeMath.sol";
import "../Crowdsale.sol";
Expand Down Expand Up @@ -36,7 +36,7 @@ contract IndividuallyCappedCrowdsale is Crowdsale, Ownable {
}

/**
* @dev Returns the cap of a specific user.
* @dev Returns the cap of a specific user.
* @param _beneficiary Address whose cap is to be checked
* @return Current cap for individual user
*/
Expand Down
8 changes: 4 additions & 4 deletions contracts/crowdsale/validation/WhitelistedCrowdsale.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^ 0.4.18;
pragma solidity ^0.4.18;

import "../Crowdsale.sol";
import "../../ownership/Ownable.sol";
Expand Down Expand Up @@ -27,9 +27,9 @@ contract WhitelistedCrowdsale is Crowdsale, Ownable {
function addToWhitelist(address _beneficiary) external onlyOwner {
whitelist[_beneficiary] = true;
}

/**
* @dev Adds list of addresses to whitelist. Not overloaded due to limitations with truffle testing.
* @dev Adds list of addresses to whitelist. Not overloaded due to limitations with truffle testing.
* @param _beneficiaries Addresses to be added to the whitelist
*/
function addManyToWhitelist(address[] _beneficiaries) external onlyOwner {
Expand All @@ -39,7 +39,7 @@ contract WhitelistedCrowdsale is Crowdsale, Ownable {
}

/**
* @dev Removes single address from whitelist.
* @dev Removes single address from whitelist.
* @param _beneficiary Address to be removed to the whitelist
*/
function removeFromWhitelist(address _beneficiary) external onlyOwner {
Expand Down