mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-16 00:43:46 +00:00
minor changes
This commit is contained in:
parent
560ad7dd9d
commit
e5d5802612
3 changed files with 0 additions and 156 deletions
|
|
@ -15,12 +15,6 @@
|
||||||
"londonBlock": 23850000,
|
"londonBlock": 23850000,
|
||||||
"bor": {
|
"bor": {
|
||||||
"jaipurBlock": 23850000,
|
"jaipurBlock": 23850000,
|
||||||
<<<<<<< HEAD
|
|
||||||
"period": 2,
|
|
||||||
"producerDelay": 6,
|
|
||||||
"sprint": 64,
|
|
||||||
"backupMultiplier": 2,
|
|
||||||
=======
|
|
||||||
"period": {
|
"period": {
|
||||||
"0": 2
|
"0": 2
|
||||||
},
|
},
|
||||||
|
|
@ -29,7 +23,6 @@
|
||||||
"backupMultiplier": {
|
"backupMultiplier": {
|
||||||
"0": 2
|
"0": 2
|
||||||
},
|
},
|
||||||
>>>>>>> 2d84249492818622540ddf5136234fa734e5950a
|
|
||||||
"validatorContract": "0x0000000000000000000000000000000000001000",
|
"validatorContract": "0x0000000000000000000000000000000000001000",
|
||||||
"stateReceiverContract": "0x0000000000000000000000000000000000001001",
|
"stateReceiverContract": "0x0000000000000000000000000000000000001001",
|
||||||
"overrideStateSyncRecords": {
|
"overrideStateSyncRecords": {
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue