Commit d5e196f4 authored by Cecile Tonglet's avatar Cecile Tonglet
Browse files

Merge commit a6c637ae (conflicts)

parents f1b1362e a6c637ae
Pipeline #127712 failed with stages
in 7 minutes and 19 seconds
This diff is collapsed.
......@@ -878,6 +878,7 @@ pub fn new_full<RuntimeApi, Executor>(
block_proposal_slot_portion: babe::SlotProportion::new(2f32 / 3f32),
telemetry: telemetry.as_ref().map(|x| x.handle()),
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment