Handle conflicting file

darwinia-network · Oct 26, 2020 · bc8ef74 · bc8ef74
1 parent 9345548
commit bc8ef74
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
@@ -366,8 +366,7 @@ use static_assertions::const_assert;
 // --- substrate ---
 use frame_support::{
 	construct_runtime, debug, parameter_types,
-	traits::{InstanceFilter, KeyOwnerProofSystem, LockIdentifier, Randomness},
-	// traits::{KeyOwnerProofSystem, LockIdentifier, Randomness, FindAuthor},
+	traits::{FindAuthor, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, Randomness},
 	weights::{
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
 		Weight,