fixing merge conflicts from rebasing

2022-12-15 21:19:42 +03:30 · 2022-12-15 21:19:42 +03:30 · 5411e03675
parent a4679036b2
commit 5411e03675
4 changed files with 0 additions and 1127 deletions
--- a/contracts/FleekERC721.sol
+++ b/contracts/FleekERC721.sol
@ -66,10 +66,6 @@ contract FleekERC721 is ERC721, FleekAccessControl {
    ) public payable requireCollectionOwner returns (uint256) {
        uint256 tokenId = _tokenIds.current();
        _mint(to, tokenId);
-<<<<<<< HEAD
-        _addTokenController(tokenId, to);
-=======
->>>>>>> 752bbb8 (refactor: change token controller role validation to _beforeTokenTransfer function)
        _tokenIds.increment();

        App storage app = _apps[tokenId];
--- a/deployments/poligonMumbai/.chainId
+++ b/deployments/poligonMumbai/.chainId
@ -1 +0,0 @@
-80001
--- a/deployments/poligonMumbai/FleekERC721.json
+++ b/deployments/poligonMumbai/FleekERC721.json
--- a/deployments/poligonMumbai/solcInputs/8aabd8091114725afcd541b4735c2ca2.json
+++ b/deployments/poligonMumbai/solcInputs/8aabd8091114725afcd541b4735c2ca2.json