Resolve conflicts

matter-labs · Nov 27, 2024 · 3929f26 · 3929f26
2 parents 360a103 + cbc91e3
commit 3929f26
Show file tree

Hide file tree

Showing 229 changed files with 8,436 additions and 2,429 deletions.
diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json
@@ -1,5 +1,5 @@
 {
   "core": "25.2.0",
-  "prover": "17.1.0",
+  "prover": "17.1.1",
   "zkstack_cli": "0.1.2"
 }
diff --git a/.gitignore b/.gitignore
@@ -120,3 +120,6 @@ configs/*
 era-observability/
 core/tests/ts-integration/deployments-zk
 transactions/
+
+# foundry-zksync
+install