chore: Fix merge-train conflicts#23173
Merged
federicobarbacovi merged 1 commit intoMay 12, 2026
Merged
Conversation
iakovenkos
approved these changes
May 12, 2026
rangozd
pushed a commit
to rangozd/aztec-packages
that referenced
this pull request
May 16, 2026
BEGIN_COMMIT_OVERRIDE chore: circuit to polys cleanup (AztecProtocol#23013) chore: translator fixes (AztecProtocol#22983) chore: cycle group defense in depth (AztecProtocol#23118) chore: add a shplemini failure test (AztecProtocol#23147) feat: multi-app kernel circuits (AztecProtocol#23076) chore(dsl): require MemOp index and value to be witnesses (AztecProtocol#23171) chore: Fix merge-train conflicts (AztecProtocol#23173) chore: Merge next into merge-train/barretenberg (AztecProtocol#23191) fix: Fix conflicts next vs merge-train/barretenberg (AztecProtocol#23194) chore: poly audit followup (AztecProtocol#23053) chore: shrink msm test size while maintaining coverage (AztecProtocol#23226) END_COMMIT_OVERRIDE
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After the multi app PR landed, there were conflicts in the private kernel execution prover. This PR resolves them.
The conflicts came from this PR: 66d7308