Skip to content

Commit 85c3275

Browse files
authored
Merge language-reference-stable into main (#16243)
This solves all merge conflicts between `language-reference-stable` and `main` Solves the first part of #16238
2 parents 62d3875 + 2dc1339 commit 85c3275

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

docs/_docs/reference/dropped-features/this-qualifier.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,3 @@ This can cause problems if a program tries to access the missing private field v
2929
// [C] needed if `field` is to be accessed through reflection
3030
val retained = field * field
3131
```
32-
33-

docs/_docs/reference/other-new-features/indentation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,4 +506,4 @@ ColonArgument ::= colon [LambdaStart]
506506
indent (CaseClauses | Block) outdent
507507
LambdaStart ::= FunParams (‘=>|?=>’)
508508
| HkTypeParamClause=>
509-
```
509+
```

0 commit comments

Comments
 (0)