Merge upstream master into patched/master

c2c29b34 · github-actions · 9c471694 · c72281ea · c2c29b34
Commit c2c29b34 authored Mar 09, 2022 by github-actions
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

erc1155.adoc docs/modules/ROOT/pages/erc1155.adoc +1 -1

No files found.
--- a/docs/modules/ROOT/pages/erc1155.adoc
+++ b/docs/modules/ROOT/pages/erc1155.adoc
@@ -136,7 +136,7 @@ In order for our contract to receive ERC1155 tokens we can inherit from the conv
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;

-import "@openzeppelin/contracts/token/ERC1155/ERC1155Holder.sol";
+import "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";

 contract MyContract is ERC1155Holder {
 }