undo pre

ourzora · Nov 17, 2023 · 9748b66 · 9748b66
1 parent 27eb57a
commit 9748b66
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 22 deletions.
diff --git a/.changeset/pre.json b/.changeset/pre.json
diff --git 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