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.

Sign up for GitHub

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

Jump to bottom

Fix conflict with new ScalaSettings #20264

Merged
merged 1 commit into from
Apr 25, 2024
Merged

Fix conflict with new ScalaSettings #20264

merged 1 commit into from
Apr 25, 2024

Conversation

nicolasstucki
Copy link
Contributor

Conflict between #18783 and #19766.

See val sets = ScalaSettings in the test just above.

@Gedochao Gedochao requested a review from rochala April 25, 2024 11:50
@Gedochao Gedochao requested a review from Linyxus April 25, 2024 11:51
Linyxus
Linyxus approved these changes Apr 25, 2024
View reviewed changes
Copy link
Contributor

@Linyxus Linyxus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot! That LGTM

@nicolasstucki nicolasstucki merged commit 1cf779c into scala:main Apr 25, 2024
18 checks passed
@nicolasstucki nicolasstucki deleted the fix-conflict branch April 25, 2024 13:37
@nicolasstucki nicolasstucki mentioned this pull request Apr 25, 2024
Closed
@Kordyjan Kordyjan added this to the 3.5.0 milestone May 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Linyxus Linyxus Linyxus approved these changes

@rochala rochala rochala approved these changes

Assignees

@rochala rochala

Labels
prio:blocker
Projects
None yet
Milestone
3.5.0
Development

Successfully merging this pull request may close these issues.
4 participants
@nicolasstucki @Linyxus @rochala @Kordyjan