Commit Graph

8 Commits

Author SHA1 Message Date
Zachinquarantine 26b8170f5e
[DOCS]: add note about hardcoded ropsten ttd (#25138)
As per #25018 (included in v1.10.19), the new Ropsten TTD is hardcoded, and users no longer have to use the --override.terminaltotaldifficulty flag.
2022-06-22 10:41:32 +02:00
Sina Mahmoodi 81604199c6
merge: fix ropsten ttd (#25052) 2022-06-09 17:45:34 +03:00
Andrei Drozd 3e629777c1
Fix typo in "the merge" documentation (#25023) 2022-06-06 18:19:22 +02:00
Felix Lange ed5e3c79dd fix syntax error in merge.md 2022-05-27 00:51:55 +02:00
Felix Lange dc5223d3b3 update text about ropsten merge transition 2022-05-27 00:49:04 +02:00
Felix Lange c5b524d8bf add ttd override for Ropsten 2022-05-27 00:42:04 +02:00
Joseph Cook 65592fb3e5
add info to merge page (#24972)
* add info to merge page

* Update merge.md

Co-authored-by: Felix Lange <fjl@twurst.com>
2022-05-26 23:43:37 +02:00
Sina Mahmoodi 545feda51a
docs: add basic info about the merge (#24948)
* merge: add basic info

* second pass

* merge guide updates

Co-authored-by: Felix Lange <fjl@twurst.com>
2022-05-25 14:21:18 +02:00