Skip to content

Revert to original indentation syntax #11213

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

Merged
merged 9 commits into from
Jan 26, 2021
Merged

Conversation

odersky
Copy link
Contributor

@odersky odersky commented Jan 25, 2021

No description provided.

This reverts commit 1ac12ce.

# Conflicts:
#	docs/docs/reference/other-new-features/indentation.md
#	docs/docs/reference/syntax.md
This reverts commit b0933d3.

# Conflicts:
#	compiler/src/dotty/tools/dotc/parsing/Parsers.scala
#	docs/docs/internals/syntax.md
#	docs/docs/reference/contextual/givens.md
This reverts commit acdee20.

# Conflicts:
#	docs/docs/internals/syntax.md
@odersky odersky merged commit a3b7ed6 into scala:master Jan 26, 2021
@odersky odersky deleted the revert-with branch January 26, 2021 17:24
@ShapelessCat ShapelessCat mentioned this pull request Feb 17, 2021
35 tasks
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.

1 participant