From b66d0b01b670bbbdf05431c6636a0300907f0ec8 Mon Sep 17 00:00:00 2001
From: Daniel Shiposha <dshiposha@usetech.com>
Date: Fri, 12 Aug 2022 13:19:23 +0000
Subject: [PATCH] fix(config): after conflicts


---
--- a/runtime/common/config/parachain.rs
+++ b/runtime/common/config/parachain.rs
@@ -37,6 +37,7 @@
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type XcmpMessageHandler = XcmpQueue;
+	type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 }
 
 impl parachain_info::Config for Runtime {}
--- a/runtime/common/config/substrate.rs
+++ b/runtime/common/config/substrate.rs
@@ -199,7 +199,6 @@
 	type SpendFunds = ();
 	type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;
 	type MaxApprovals = MaxApprovals;
-	type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 }
 
 impl pallet_sudo::Config for Runtime {
--- a/runtime/tests/src/lib.rs
+++ b/runtime/tests/src/lib.rs
@@ -270,7 +270,7 @@
 }
 
 impl pallet_unique::Config for Test {
-	type Event = ();
+	type Event = Event;
 	type WeightInfo = ();
 	type CommonWeightInfo = CommonWeights<Self>;
 	type RefungibleExtensionsWeightInfo = CommonWeights<Self>;

-- 
gitstuff