mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-02-06 20:14:01 -06:00
cd308e78ba
Conflicts: src/compiler/checker.ts src/compiler/diagnosticInformationMap.generated.ts src/compiler/parser.ts tests/baselines/reference/FunctionDeclaration5_es6.errors.txt tests/baselines/reference/VariableDeclaration2_es6.errors.txt tests/baselines/reference/VariableDeclaration4_es6.errors.txt tests/baselines/reference/anonymousModules.errors.txt tests/baselines/reference/callSignaturesWithParameterInitializers2.errors.txt tests/baselines/reference/conflictMarkerTrivia1.errors.txt tests/baselines/reference/dottedModuleName.errors.txt tests/baselines/reference/innerModExport1.errors.txt tests/baselines/reference/innerModExport2.errors.txt tests/baselines/reference/parserAccessors10.errors.txt tests/baselines/reference/parserComputedPropertyName5.errors.txt tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction1.errors.txt tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.errors.txt tests/baselines/reference/parserModifierOnStatementInBlock2.errors.txt tests/baselines/reference/parserSkippedTokens16.errors.txt tests/baselines/reference/privateIndexer2.errors.txt