Merge remote-tracking branch 'origin/master' into gui-treasury-weight

frame/treasury/src/lib.rs

@@ -98,8 +98,13 @@ use frame_support::traits::{
 use sp_runtime::{Permill, ModuleId, Percent, RuntimeDebug, traits::{
 	Zero, StaticLookup, AccountIdConversion, Saturating, Hash, BadOrigin
 }};
+<<<<<<< HEAD
 use frame_support::weights::Weight;
 use frame_support::traits::{Contains, ContainsLengthBound, EnsureOrigin};
+=======
+use frame_support::weights::{Weight, DispatchClass};
+use frame_support::traits::{Contains, EnsureOrigin};
+>>>>>>> origin/master
 use codec::{Encode, Decode};
 use frame_system::{self as system, ensure_signed, ensure_root};