jeffemmett
/
non-fungible-apps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix rebase conflict

This commit is contained in:
EmperorOrokuSaki 2022-12-15 21:12:25 +03:30
parent 6e036f3b9e
commit a4679036b2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/FleekERC721.sol
View File

@ -17,7 +17,7 @@ contract FleekERC721 is ERC721, FleekAccessControl {
event NewTokenImage(uint256 indexed token, string indexed image); event NewTokenImage(uint256 indexed token, string indexed image);
event NewTokenExternalURL(uint256 indexed token, string indexed external_url); event NewTokenExternalURL(uint256 indexed token, string indexed external_url);
event NewTokenENS(uint256 indexed token, string indexed ENS); event NewTokenENS(uint256 indexed token, string indexed ENS);
struct Build { struct Build {
string commit_hash; string commit_hash;
string git_repository; string git_repository;
@ -66,7 +66,10 @@ contract FleekERC721 is ERC721, FleekAccessControl {
) public payable requireCollectionOwner returns (uint256) { ) public payable requireCollectionOwner returns (uint256) {
uint256 tokenId = _tokenIds.current(); uint256 tokenId = _tokenIds.current();
_mint(to, tokenId); _mint(to, tokenId);
<<<<<<< HEAD
_addTokenController(tokenId, to); _addTokenController(tokenId, to);
=======
>>>>>>> 752bbb8 (refactor: change token controller role validation to _beforeTokenTransfer function)
_tokenIds.increment(); _tokenIds.increment();
App storage app = _apps[tokenId]; App storage app = _apps[tokenId];