From a4679036b21bad0808e33b326dab68e6282ff7a9 Mon Sep 17 00:00:00 2001
From: EmperorOrokuSaki <artie.eth@gmail.com>
Date: Thu, 15 Dec 2022 21:12:25 +0330
Subject: [PATCH] fix rebase conflict

---
 contracts/FleekERC721.sol | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contracts/FleekERC721.sol b/contracts/FleekERC721.sol
index 2749009..f22ad22 100644
--- a/contracts/FleekERC721.sol
+++ b/contracts/FleekERC721.sol
@@ -17,7 +17,7 @@ contract FleekERC721 is ERC721, FleekAccessControl {
     event NewTokenImage(uint256 indexed token, string indexed image);
     event NewTokenExternalURL(uint256 indexed token, string indexed external_url);
     event NewTokenENS(uint256 indexed token, string indexed ENS);
-    
+
     struct Build {
         string commit_hash;
         string git_repository;
@@ -66,7 +66,10 @@ 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];