Fix more merge conflicts between unstable and release-v7.0.0

2026-03-10 12:11:59 +00:00 · 2025-03-23 11:14:34 -06:00
parent cbf1c04a14
commit 2f37bf4de5
3 changed files with 5 additions and 9 deletions
--- a/beacon_node/src/config.rs
+++ b/beacon_node/src/config.rs
@@ -918,11 +918,7 @@ pub fn get_config<E: EthSpec>(
                |s| match Hash256::from_str(s.strip_prefix("0x").unwrap_or(s).trim()) {
                    Ok(block_root) => Some(block_root),
                    Err(error) => {
-                        warn!(
-                            block_root = s,
-                            ?error,
-                            "Unable to parse invalid block root",
-                        );
+                        warn!(block_root = s, ?error, "Unable to parse invalid block root",);
                        None
                    }
                },