Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into gui-staking-fix-wro…
…ng-reward-attribution
  • Loading branch information
gui1117 committed Dec 12, 2019
commit c1cc3475a2b48fe435b7fc02050183a9d8b76658
2 changes: 1 addition & 1 deletion frame/staking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ primitives = { package = "sp-core", path = "../../primitives/core" }
balances = { package = "pallet-balances", path = "../balances" }
timestamp = { package = "pallet-timestamp", path = "../timestamp" }
pallet-staking-reward-curve = { path = "../staking/reward-curve"}
substrate-test-utils = { path = "../../test/utils" }
substrate-test-utils = { path = "../../test-utils" }
pretty_assertions = "0.6.1"

[features]
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.