Fix rebase conflicts

This commit is contained in:
Emilia Hane 2023-01-26 20:35:21 +01:00
parent 50e01bef1f
commit 546d63f83c
No known key found for this signature in database
GPG Key ID: E73394F9C09206FA

View File

@ -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
# ---------------------------------------------------------------