resolve conflicts

matter-labs · Jan 29, 2025 · 39be097 · 39be097
2 parents 9f7a002 + e3759a2
commit 39be097
Show file tree

Hide file tree

Showing 29 changed files with 1,591 additions and 221 deletions.
diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json
@@ -1,5 +1,5 @@
 {
-  "core": "26.2.0",
+  "core": "26.2.1",
   "prover": "18.0.0",
   "zkstack_cli": "0.1.2"
 }
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [26.2.1](https://github.com/matter-labs/zksync-era/compare/core-v26.2.0...core-v26.2.1) (2025-01-28)
+
+
+### Bug Fixes
+
+* add . to readme ([#3538](https://github.com/matter-labs/zksync-era/issues/3538)) ([512dd45](https://github.com/matter-labs/zksync-era/commit/512dd459307e57762dd4cc2c78ff4151634b6941))
+
 ## [26.2.0](https://github.com/matter-labs/zksync-era/compare/core-v26.1.0...core-v26.2.0) (2025-01-24)