Fix conflict with `new ScalaSettings`#20264

nicolasstucki merged 1 commit intoscala:mainscala/scala3:mainfrom

dotty-staging:fix-conflictdotty-staging/dotty:fix-conflictCopy head branch name to clipboard