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

fixing merge conflicts from rebasing

This commit is contained in:
EmperorOrokuSaki 2022-12-15 21:19:42 +03:30
parent a4679036b2
commit 5411e03675
4 changed files with 0 additions and 1127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/FleekERC721.sol
View File

@ -66,10 +66,6 @@ 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);
=======
>>>>>>> 752bbb8 (refactor: change token controller role validation to _beforeTokenTransfer function)
_tokenIds.increment(); _tokenIds.increment();
App storage app = _apps[tokenId]; App storage app = _apps[tokenId];

1
deployments/poligonMumbai/.chainId
View File

@ -1 +0,0 @@
80001

1045
deployments/poligonMumbai/FleekERC721.json
View File

File diff suppressed because one or more lines are too long

77
deployments/poligonMumbai/solcInputs/8aabd8091114725afcd541b4735c2ca2.json
View File

File diff suppressed because one or more lines are too long