Merge upstream release-v4.5 into patched/release-v4.5

92cc78dc · github-actions · 8eef80cd · 5c4b75a9 · 92cc78dc · 92cc78dc
Commit 92cc78dc authored Feb 25, 2022 by github-actions
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

IERC2981.sol contracts/interfaces/IERC2981.sol +1 -1

ERC20FlashMint.sol contracts/token/ERC20/extensions/ERC20FlashMint.sol +2 -1

No files found.
--- a/contracts/interfaces/IERC2981.sol
+++ b/contracts/interfaces/IERC2981.sol
@@ -3,7 +3,7 @@

 pragma solidity ^0.8.0;

-import "./IERC165.sol";
+import "../utils/introspection/IERC165.sol";

 /**
 * @dev Interface for the NFT Royalty Standard.

--- a/contracts/token/ERC20/extensions/ERC20FlashMint.sol
+++ b/contracts/token/ERC20/extensions/ERC20FlashMint.sol
@@ -3,7 +3,8 @@

 pragma solidity ^0.8.0;

-import "../../../interfaces/IERC3156.sol";
+import "../../../interfaces/IERC3156FlashBorrower.sol";
+import "../../../interfaces/IERC3156FlashLender.sol";
 import "../ERC20.sol";

 /**