rebase conflict fixes

af604379 · Manuel Araoz · 7d83a086 · af604379
Commit af604379 authored Apr 05, 2017 by Manuel Araoz
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

LimitedTransferToken.sol contracts/token/LimitedTransferToken.sol +2 -2

No files found.
--- a/contracts/token/LimitedTransferToken.sol
+++ b/contracts/token/LimitedTransferToken.sol
@@ -33,12 +33,12 @@ contract LimitedTransferToken is ERC20 {
  }

  // Checks modifier and allows transfer if tokens are not locked.
-  function transfer(address _to, uint _value) canTransfer(msg.sender, _value) returns (bool success) {
+  function transfer(address _to, uint _value) canTransfer(msg.sender, _value) {
   return super.transfer(_to, _value);
  }

  // Checks modifier and allows transfer if tokens are not locked.
-  function transferFrom(address _from, address _to, uint _value) canTransfer(_from, _value) returns (bool success) {
+  function transferFrom(address _from, address _to, uint _value) canTransfer(_from, _value) {
   return super.transferFrom(_from, _to, _value);
  }