revert code change (bad merge?)

frangio · frangio · commit 96cbe162cbfe · 2021-02-22T13:38:28.000-03:00
diff --git a/contracts/token/ERC20/extensions/ERC20Burnable.sol b/contracts/token/ERC20/extensions/ERC20Burnable.sol
@@ -32,9 +32,9 @@ abstract contract ERC20Burnable is Context, ERC20 {
      * `amount`.
      */
     function burnFrom(address account, uint256 amount) public virtual {
-        uint256 allowance_ = allowance(account, _msgSender());
-        require(allowance_ >= amount, "ERC20: burn amount exceeds allowance");
-        _approve(account, _msgSender(), allowance_ - amount);
+        uint256 currentAllowance = allowance(account, _msgSender());
+        require(currentAllowance >= amount, "ERC20: burn amount exceeds allowance");
+        _approve(account, _msgSender(), currentAllowance - amount);
         _burn(account, amount);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ abstract contract ERC20Burnable is Context, ERC20 {`
`32`	`32`	* `amount`.
`33`	`33`	`*/`
`34`	`34`	`function burnFrom(address account, uint256 amount) public virtual {`
`35`		`- uint256 allowance_ = allowance(account, _msgSender());`
`36`		`- require(allowance_ >= amount, "ERC20: burn amount exceeds allowance");`
`37`		`- _approve(account, _msgSender(), allowance_ - amount);`
	`35`	`+ uint256 currentAllowance = allowance(account, _msgSender());`
	`36`	`+ require(currentAllowance >= amount, "ERC20: burn amount exceeds allowance");`
	`37`	`+ _approve(account, _msgSender(), currentAllowance - amount);`
`38`	`38`	`_burn(account, amount);`
`39`	`39`	`}`
`40`	`40`	`}`