Commit c2c29b34 by github-actions

Merge upstream master into patched/master

parents 9c471694 c72281ea
...@@ -136,7 +136,7 @@ In order for our contract to receive ERC1155 tokens we can inherit from the conv ...@@ -136,7 +136,7 @@ In order for our contract to receive ERC1155 tokens we can inherit from the conv
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
pragma solidity ^0.8.0; pragma solidity ^0.8.0;
import "@openzeppelin/contracts/token/ERC1155/ERC1155Holder.sol"; import "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";
contract MyContract is ERC1155Holder { contract MyContract is ERC1155Holder {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment