From 8f57853e44adf929cfdb13b122d09558f9b03475 Mon Sep 17 00:00:00 2001
From: Dan Oved <stangogh@gmail.com>
Date: Fri, 17 Nov 2023 08:14:33 -0800
Subject: [PATCH] undo pre

---
 .changeset/pre.json                        | 13 -------------
 packages/protocol-deployments/CHANGELOG.md |  9 ---------
 2 files changed, 22 deletions(-)
 delete mode 100644 .changeset/pre.json

diff --git a/.changeset/pre.json b/.changeset/pre.json
deleted file mode 100644
index 96caf84f7..000000000
--- a/.changeset/pre.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "mode": "pre",
-  "tag": "prerelease",
-  "initialVersions": {
-    "@zoralabs/zora-1155-contracts": "2.4.0",
-    "@zoralabs/premint-sdk": "0.1.1",
-    "@zoralabs/protocol-deployments": "0.0.4",
-    "@zoralabs/protocol-rewards": "1.2.1"
-  },
-  "changesets": [
-    "cold-toys-agree"
-  ]
-}
diff --git a/packages/protocol-deployments/CHANGELOG.md b/packages/protocol-deployments/CHANGELOG.md
index 833d0e86d..31da36cd7 100644
--- a/packages/protocol-deployments/CHANGELOG.md
+++ b/packages/protocol-deployments/CHANGELOG.md
@@ -1,19 +1,10 @@
 # @zoralabs/premint-sdk
 
-<<<<<<< HEAD
 ## 0.0.5
 
 ### Patch Changes
 
 - 293e2c0: Moved deployment related code from 1155 to protocol-deployments package
-=======
-## 0.0.5-prerelease.0
-
-### Patch Changes
-
-- a50ae1c: \* Moved deployment related code from 1155 to protocol-deployments package
-  - Deployed 2.4.0 to zora-goerli (testnet)
->>>>>>> 56ad2cd4 (Move deployment related config to protocol-deployments)
 
 ## 0.0.4