mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-02-05 16:38:05 -06:00
4c5aeaf0c9
Conflicts: src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json src/compiler/program.ts tests/baselines/reference/constDeclarations-access5.errors.txt tests/baselines/reference/es6-amd.errors.txt tests/baselines/reference/es6-declaration-amd.errors.txt tests/baselines/reference/es6-sourcemap-amd.errors.txt tests/baselines/reference/es6-umd.errors.txt tests/baselines/reference/es6-umd2.errors.txt tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt tests/baselines/reference/es6ImportNameSpaceImport.errors.txt tests/baselines/reference/es6ImportNamedImport.errors.txt tests/baselines/reference/es6ImportNamedImportInExportAssignment.errors.txt tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.errors.txt