BACKPORT-CONFLICT

paritytech · Dec 13, 2024 · f122a78 · f122a78
1 parent f2081f6
commit f122a78
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -821,7 +821,11 @@ macro_magic = { version = "0.5.1" }
 maplit = { version = "1.0.2" }
 memmap2 = { version = "0.9.3" }
 memory-db = { version = "0.32.0", default-features = false }
+<<<<<<< HEAD
 merkleized-metadata = { version = "0.1.0" }
+=======
+merkleized-metadata = { version = "0.2.0" }
+>>>>>>> 6d92ded (Update merkleized-metadata to 0.2.0 (#6863))
 merlin = { version = "3.0", default-features = false }
 messages-relay = { path = "bridges/relays/messages", version = "0.1.0" }
 metered = { version = "0.6.1", default-features = false, package = "prioritized-metered-channel" }

diff --git a/prdoc/pr_6863.prdoc b/prdoc/pr_6863.prdoc
@@ -0,0 +1,9 @@
+title: Update merkleized-metadata to 0.2.0
+doc:
+- audience: Node Dev
+  description: |-
+    0.1.2 was yanked as it was breaking semver.
+crates: 
+  - name: substrate-wasm-builder
+    bump: patch
+    validate: false