From 546d63f83c782f5ca7237d6ac5d4ab5221894aa5 Mon Sep 17 00:00:00 2001 From: Emilia Hane Date: Thu, 26 Jan 2023 20:35:21 +0100 Subject: [PATCH] Fix rebase conflicts --- .../built_in_network_configs/eip4844/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/eth2_network_config/built_in_network_configs/eip4844/config.yaml b/common/eth2_network_config/built_in_network_configs/eip4844/config.yaml index 156fea17a..f7334b618 100644 --- a/common/eth2_network_config/built_in_network_configs/eip4844/config.yaml +++ b/common/eth2_network_config/built_in_network_configs/eip4844/config.yaml @@ -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 # ---------------------------------------------------------------