Fix math.map/math.lerp merge fallout #1621
Merged
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
Collaborator
zeux
commented
Jan 19, 2025
zeux
commented
- LuauMathMap flag was not removed but the uses of it were
- LuauMathLerp addition to math table was duplicated
- LuauMathMap flag was not removed but the uses of it were - LuauMathLerp addition to math table was duplicated
vrn-sn
approved these changes
Jan 19, 2025
|
Thank you! |
vegorov-rbx
added a commit
that referenced
this pull request
Jan 20, 2025
During conflict resolution while transferring patches back and forth, some conflict resolutions may cause differences that are harder to spot. This process would have also cleaned up differences noted in #1621
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.