Skip to content

Commit

Permalink
Merge branch 'add-ticks-per-slot-option' of github.com:petrkozorezov/…
Browse files Browse the repository at this point in the history
…anchor into petrkozorezov-add-ticks-per-slot-option
  • Loading branch information
henrye committed Dec 12, 2022
2 parents ce8e467 + 331a227 commit 9046a8c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion cli/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1074,7 +1074,9 @@ impl Merge for _Validator {
slots_per_epoch: other
.slots_per_epoch
.or_else(|| self.slots_per_epoch.take()),
ticks_per_slot: other.ticks_per_slot.or_else(|| self.ticks_per_slot.take()),
ticks_per_slot: other
.ticks_per_slot
.or_else(|| self.ticks_per_slot.take()),
warp_slot: other.warp_slot.or_else(|| self.warp_slot.take()),
};
}
Expand Down

0 comments on commit 9046a8c

Please sign in to comment.