Resolve merge conflicts

2026-05-30 12:47:05 +00:00 · 2026-05-17 12:13:00 +03:00
parent f5e4a66d89 ac7fc2206a
commit 278111f4c4
161 changed files with 1979 additions and 1320 deletions
--- a/testing/execution_engine_integration/src/nethermind.rs
+++ b/testing/execution_engine_integration/src/nethermind.rs
@@ -20,6 +20,7 @@ fn build_result(repo_dir: &Path) -> Output {
        .arg("src/Nethermind/Nethermind.sln")
        .arg("-c")
        .arg("Release")
+        .arg("-p:TreatWarningsAsErrors=false")
        .current_dir(repo_dir)
        .output()
        .expect("failed to make nethermind")