From 003724990a67c2a4e0f27c2751425c7b12cbc7fb Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Mon, 16 Dec 2024 12:04:49 +0100
Subject: [PATCH] Fix conflicts

---
 packages/vm/Cargo.toml | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
index 456e8a7e2..976e5bc50 100644
--- a/packages/vm/Cargo.toml
+++ b/packages/vm/Cargo.toml
@@ -10,27 +10,11 @@ license = "Apache-2.0"
 [package.metadata.release]
 pre-release-hook = ["../../devtools/release_checks.sh"]
 pre-release-replacements = [
-<<<<<<< HEAD
-  { file = "../../CHANGELOG.md", search = "## \\[Unreleased\\]", replace = "## [{{version}}] - {{date}}", exactly = 1 },
-  { file = "../../CHANGELOG.md", search = "(U|u)nreleased", replace = "{{version}}" },
-  { file = "../../CHANGELOG.md", search = "<!-- next-header -->", replace = "<!-- next-header -->\n\n## [Unreleased]", exactly = 1 },
-  { file = "../../CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}", exactly = 1 },
-  { file = "../../CHANGELOG.md", search = "<!-- next-url -->\n", replace = "<!-- next-url -->\n\n[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/{{tag_name}}...HEAD", exactly = 1 },
-=======
     { file = "../../CHANGELOG.md", search = "## \\[Unreleased\\]", replace = "## [{{version}}] - {{date}}", exactly = 1 },
     { file = "../../CHANGELOG.md", search = "(U|u)nreleased", replace = "{{version}}" },
     { file = "../../CHANGELOG.md", search = "<!-- next-header -->", replace = "<!-- next-header -->\n\n## [Unreleased]", exactly = 1 },
-<<<<<<< HEAD
-    { file = "../../CHANGELOG.md", search = "<!-- next-url -->\n", replace = "<!-- next-url -->\n\n[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/{{tag_name}}...HEAD", exactly = 1 },
-<<<<<<< HEAD
->>>>>>> 55ee235b (Fix replacement order)
-=======
-    { file = "../../CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}", exactly = 1 },
->>>>>>> 38fea3a7 ([autofix.ci] apply automated fixes)
-=======
     { file = "../../CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}", exactly = 1 },
     { file = "../../CHANGELOG.md", search = "<!-- next-url -->\n", replace = "<!-- next-url -->\n\n[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/{{tag_name}}...HEAD", exactly = 1 },
->>>>>>> 961abe68 (Fix replacement order (again))
 ]
 
 [features]
@@ -59,16 +43,24 @@ clru = "0.6.1"
 crc32fast = "1.3.2"
 bech32 = "0.9.1"
 # Uses the path when built locally; uses the given version from crates.io when published
-cosmwasm-std = { path = "../std", version = "2.0.8", default-features = false, features = ["std"] }
+cosmwasm-std = { path = "../std", version = "2.0.8", default-features = false, features = [
+    "std",
+] }
 cosmwasm-crypto = { path = "../crypto", version = "2.0.8" }
 derivative = "2"
 hex = "0.4"
 schemars = "0.8.3"
-serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.103", default-features = false, features = [
+    "derive",
+    "alloc",
+] }
 serde_json = "1.0.40"
 sha2 = "0.10.3"
 thiserror = "1.0.26"
-wasmer = { version = "=4.2.6", default-features = false, features = ["cranelift", "singlepass"] }
+wasmer = { version = "=4.2.6", default-features = false, features = [
+    "cranelift",
+    "singlepass",
+] }
 wasmer-middlewares = "=4.2.6"
 wasmer-types = "=4.2.6"
 strum = { version = "0.25.0", default-features = false, features = ["derive"] }