Fix conflicts main #377
Merged
Fix conflicts main #377
Conversation
This file contains 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
Co-authored-by: hadaringonyama <hadar@ingonyama.com>
Change rust example deps to use paths Co-authored-by: Leon Hibnik <107353745+LeonHibnik@users.noreply.github.com>
Release 1.3.0: * [FEAT] Mixed-radix NTT design * [FEAT] example paths changed
yshekel
force-pushed
the
fix-conflicts-main
branch
from
1371c85
to
ba6c3ae
Compare
yshekel
approved these changes
Feb 15, 2024
LeonHibnik
approved these changes
Feb 15, 2024
vhnatyk
reviewed
Feb 15, 2024
examples/rust/msm/rust-toolchain
Outdated
There was a problem hiding this comment.
it was removed in bindings in dev, right?
There was a problem hiding this comment.
I removed 'wrappers/rust/rust-toolchain' but I am not sure about this one and the other one in the ntt examples.
ImmanuelSegol
approved these changes
Feb 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR fixes the conflicts between main and dev