Skip to content

Commit

Permalink
Fix spurious change added by git merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ignopeverell committed Jan 14, 2019
1 parent 224a26f commit 6bb611a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/src/consensus.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pub const COINBASE_MATURITY: u64 = DAY_HEIGHT;
/// function of block height (time). Starts at 90% losing a percent
/// approximately every week. Represented as an integer between 0 and 100.
pub fn secondary_pow_ratio(height: u64) -> u64 {
90u64.saturating_add(height / (2 * YEAR_HEIGHT / 90))
90u64.saturating_sub(height / (2 * YEAR_HEIGHT / 90))
}

/// The AR scale damping factor to use. Dependent on block height
Expand Down

0 comments on commit 6bb611a

Please sign in to comment.