Merge upstream master into patched/master

28983bb7 · github-actions · 8b590a58 · fc01c51c · 28983bb7
Commit 28983bb7 authored Feb 01, 2022 by github-actions
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

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

No files found.
--- a/docs/modules/ROOT/pages/erc721.adoc
+++ b/docs/modules/ROOT/pages/erc721.adoc
@@ -20,7 +20,7 @@ import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";
 import "@openzeppelin/contracts/utils/Counters.sol";

-contract GameItem is ERC721, ERC721URIStorage {
+contract GameItem is ERC721URIStorage {
    using Counters for Counters.Counter;
    Counters.Counter private _tokenIds;