conflicts

runtime/parachains/src/scheduler.rs

@@ -380,7 +380,7 @@ impl<T: Config> Pallet<T> {
 		now: T::BlockNumber,
 	) {
 		let mut cores = AvailabilityCores::<T>::get();
-		let config = <configuration::Module<T>>::config();
+		let config = <configuration::Pallet<T>>::config();
 
 		for (freed_index, freed_reason) in just_freed_cores {
 			if (freed_index.0 as usize) < cores.len() {
@@ -720,6 +720,7 @@ impl<T: Config> Pallet<T> {
 
 	// Free all scheduled cores and return parathread claims to queue, with retries incremented.
 	pub(crate) fn clear() {
+
 		let config = <configuration::Module<T>>::config();
 		ParathreadQueue::<T>::mutate(|queue| {
 			for core_assignment in Scheduled::<T>::take() {