Fix rebase conflicts
This commit is contained in:
parent
50e01bef1f
commit
546d63f83c
@ -1,6 +1,6 @@
|
||||
# Extends the mainnet preset
|
||||
PRESET_BASE: 'mainnet'
|
||||
CONFIG_NAME: testnet # needs to exist because of Prysm. Otherwise it conflicts with mainnet genesis
|
||||
CONFIG_NAME: 'eip4844' # needs to exist because of Prysm. Otherwise it conflicts with mainnet genesis and needs to match configuration in common_eth2_config/src/lib.rs to pass lh ci.
|
||||
|
||||
# Genesis
|
||||
# ---------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user