Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixup desync between internal and external codebases #1622

Merged
merged 1 commit into from
Jan 20, 2025

Conversation

vegorov-rbx
Copy link
Collaborator

@vegorov-rbx vegorov-rbx commented 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

@vegorov-rbx vegorov-rbx merged commit 6061a14 into luau-lang:master Jan 20, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

1 participant