mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-05-16 07:13:45 -05:00
Conflicts: src/compiler/checker.ts tests/baselines/reference/contextualTyping.js.map tests/baselines/reference/contextualTyping.sourcemap.txt tests/baselines/reference/out-flag.js.map tests/baselines/reference/properties.js.map tests/baselines/reference/recursiveClassReferenceTest.js.map tests/baselines/reference/sourceMap-FileWithComments.js.map tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt tests/baselines/reference/typeResolution.js.map