difftreelog
fix(config) after conflicts
in: master
3 files changed
runtime/common/config/parachain.rsdiffbeforeafterboth37 type ReservedDmpWeight = ReservedDmpWeight;37 type ReservedDmpWeight = ReservedDmpWeight;38 type ReservedXcmpWeight = ReservedXcmpWeight;38 type ReservedXcmpWeight = ReservedXcmpWeight;39 type XcmpMessageHandler = XcmpQueue;39 type XcmpMessageHandler = XcmpQueue;40 type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;40}41}414242impl parachain_info::Config for Runtime {}43impl parachain_info::Config for Runtime {}runtime/common/config/substrate.rsdiffbeforeafterboth199 type SpendFunds = ();199 type SpendFunds = ();200 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;200 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;201 type MaxApprovals = MaxApprovals;201 type MaxApprovals = MaxApprovals;202 type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;203}202}204203205impl pallet_sudo::Config for Runtime {204impl pallet_sudo::Config for Runtime {runtime/tests/src/lib.rsdiffbeforeafterboth270}270}271271272impl pallet_unique::Config for Test {272impl pallet_unique::Config for Test {273 type Event = ();273 type Event = Event;274 type WeightInfo = ();274 type WeightInfo = ();275 type CommonWeightInfo = CommonWeights<Self>;275 type CommonWeightInfo = CommonWeights<Self>;276 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;276 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;