From df467869402568d9681834b9cfb861659452f055 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 23 Dec 2024 14:42:32 -0300 Subject: [PATCH] Fmt --- primitives/xcm-commons/Cargo.toml | 8 -------- runtime/dancebox/Cargo.toml | 2 -- 2 files changed, 10 deletions(-) diff --git a/primitives/xcm-commons/Cargo.toml b/primitives/xcm-commons/Cargo.toml index a6afbf454..20e983340 100644 --- a/primitives/xcm-commons/Cargo.toml +++ b/primitives/xcm-commons/Cargo.toml @@ -14,8 +14,6 @@ workspace = true frame-support = { workspace = true } log = { workspace = true } staging-xcm = { workspace = true } -frame-support = { workspace = true } -log = { workspace = true } [features] default = [ @@ -25,10 +23,4 @@ std = [ "frame-support/std", "log/std", "staging-xcm/std", -<<<<<<< HEAD -] -======= - "frame-support/std", - "log/std", ] ->>>>>>> db79f6f6 (Extract NativeAssetReserve from xcm config to commons) diff --git a/runtime/dancebox/Cargo.toml b/runtime/dancebox/Cargo.toml index 3cff35967..bf7859cba 100644 --- a/runtime/dancebox/Cargo.toml +++ b/runtime/dancebox/Cargo.toml @@ -50,8 +50,6 @@ tanssi-relay-encoder = { workspace = true } tanssi-runtime-common = { workspace = true } tp-xcm-commons = { workspace = true } tp-xcm-core-buyer = { workspace = true } -tp-xcm-commons = { workspace = true } -tp-xcm-core-buyer = { workspace = true } # Moonkit async-backing-primitives = { workspace = true }