Skip to content

Fix math.map/math.lerp merge fallout#1621

Merged
vrn-sn merged 1 commit intomasterfrom
merge-fallout
Jan 19, 2025
Merged

Fix math.map/math.lerp merge fallout#1621
vrn-sn merged 1 commit intomasterfrom
merge-fallout

Conversation

@zeux
Copy link
Contributor

@zeux zeux commented Jan 19, 2025

  • 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
Copy link
Member

vrn-sn commented Jan 19, 2025

Thank you!

@vrn-sn vrn-sn merged commit 82c9383 into master Jan 19, 2025
8 checks passed
@vrn-sn vrn-sn deleted the merge-fallout branch January 19, 2025 22:14
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants