From e578e5f8b8e315639d46fc89160615718452cc7a Mon Sep 17 00:00:00 2001
From: Igor Kozyrev <igor@kozyrev.dev>
Date: Fri, 10 Dec 2021 13:02:00 +0000
Subject: [PATCH] Merge branch 'develop' into hotfix/inflation_year_fix


---
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -859,7 +859,7 @@
 		NodeBlock = opaque::Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,
+		ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,
 		ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,
 
 		Aura: pallet_aura::{Pallet, Config<T>} = 22,

-- 
gitstuff