Fmt

moondance-labs · Dec 23, 2024 · df46786 · df46786
1 parent 5c0f9c8
commit df46786
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git 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
@@ -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 }