Merge branch 'master' into dp-prep-release-v0.13

* master:
  Upgrade to substrate 2.0.0 (#173)
This commit is contained in:
David Palm
2020-09-24 17:01:43 +02:00
2 changed files with 0 additions and 2 deletions
-1
View File
@@ -238,7 +238,6 @@ impl frame_system::Trait for Runtime {
type AccountData = pallet_balances::AccountData<Balance>;
/// Weight information for the extrinsics of this pallet.
type SystemWeightInfo = ();
// type SystemWeightInfo = weights::frame_system::WeightInfo;
/// Provides information about the pallet setup in the runtime.
type PalletInfo = PalletInfo;
}