From fdf504abd4c87492ba2d3f2e3089678b0cfc92e6 Mon Sep 17 00:00:00 2001 From: Dan Oved Date: Wed, 9 Aug 2023 15:15:04 -0700 Subject: [PATCH] fix merge conflicts --- src/deployment/DeploymentConfig.sol | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/deployment/DeploymentConfig.sol b/src/deployment/DeploymentConfig.sol index cde28e6ed..c43a12077 100644 --- a/src/deployment/DeploymentConfig.sol +++ b/src/deployment/DeploymentConfig.sol @@ -31,11 +31,8 @@ struct Deployment { address factoryImpl; /// @notice Factory proxy contract that creates zora drops style NFT contracts address factoryProxy; -<<<<<<< HEAD -======= /// @notice Preminter contract address address preminter; ->>>>>>> 9ec0422 (Premint) } abstract contract DeploymentConfig is CommonBase { @@ -60,10 +57,7 @@ abstract contract DeploymentConfig is CommonBase { string constant CONTRACT_1155_IMPL = "CONTRACT_1155_IMPL"; string constant FACTORY_IMPL = "FACTORY_IMPL"; string constant FACTORY_PROXY = "FACTORY_PROXY"; -<<<<<<< HEAD -======= string constant PREMINTER = "PREMINTER"; ->>>>>>> 9ec0422 (Premint) /// @notice Return a prefixed key for reading with a ".". /// @param key key to prefix @@ -92,10 +86,7 @@ abstract contract DeploymentConfig is CommonBase { deployment.contract1155Impl = json.readAddress(getKeyPrefix(CONTRACT_1155_IMPL)); deployment.factoryImpl = json.readAddress(getKeyPrefix(FACTORY_IMPL)); deployment.factoryProxy = json.readAddress(getKeyPrefix(FACTORY_PROXY)); -<<<<<<< HEAD -======= deployment.preminter = json.readAddress(getKeyPrefix(PREMINTER)); ->>>>>>> 9ec0422 (Premint) } }