conflict fixes

This commit is contained in:
Aniket-Engg
2018-10-22 13:21:32 +05:30
parent 51e4da155b
commit a781955434
3 changed files with 0 additions and 38 deletions

View File

@ -17,15 +17,6 @@ interface IERC20 {
function transferFrom(address from, address to, uint256 value) external returns (bool);
function increaseAllowance(address spender, uint256 addedValue)
external returns (bool);
function decreaseAllowance(address spender, uint256 subtractedValue)
external returns (bool);
function setAllowance(uint256 value)
external returns (bool);
event Transfer(
address indexed from,
address indexed to,