updated changeset

ourzora · Nov 17, 2023 · 554aa1c · 554aa1c
1 parent 9748b66
commit 554aa1c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.changeset/cold-toys-agree.md b/.changeset/cold-toys-agree.md
@@ -3,4 +3,4 @@
 ---
 
 * Moved deployment related code from 1155 to protocol-deployments package
-* Deployed 2.4.0 to zora-goerli (testnet)
+* Deployed 2.4.0 to zora-goerli, zora-sepolia, base, optimism, mainnet
diff --git a/packages/protocol-deployments/script/DeployNew1155Impl.s.sol b/packages/protocol-deployments/script/DeployNew1155Impl.s.sol
@@ -5,10 +5,7 @@ import "forge-std/Script.sol";
 import "forge-std/console2.sol";
 
 import {ZoraDeployerBase} from "../src/ZoraDeployerBase.sol";
-<<<<<<< HEAD
-=======
 import {ZoraDeployerUtils} from "../src/ZoraDeployerUtils.sol";
->>>>>>> 56ad2cd4 (Move deployment related config to protocol-deployments)
 import {Deployment} from "../src/DeploymentConfig.sol";
 import {DeterministicDeployerScript} from "../src/DeterministicDeployerScript.sol";