diff --git a/Cargo.lock b/Cargo.lock index d98e9e2fc95a2..3993a78fc752a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8624,9 +8624,15 @@ dependencies = [ [[package]] name = "merkleized-metadata" +<<<<<<< HEAD version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f313fcff1d2a4bcaa2deeaa00bf7530d77d5f7bd0467a117dde2e29a75a7a17a" +======= +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c592efaf1b3250df14c8f3c2d952233f0302bb81d3586db2f303666c1cd607" +>>>>>>> 6d92ded5 (Update merkleized-metadata to 0.2.0 (#6863)) dependencies = [ "array-bytes", "blake3", diff --git a/Cargo.toml b/Cargo.toml index 1e0d2b5f71837..3b69823c7225f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -836,7 +836,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" } +>>>>>>> 6d92ded5 (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 new file mode 100644 index 0000000000000..0dd416e5e4388 --- /dev/null +++ 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