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
25 lines
No EOL
719 B
Text
25 lines
No EOL
719 B
Text
<<<<<<< HEAD
|
|
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
|
|
|
|
|
|
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
|
|
=======
|
|
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
|
|
|
|
|
|
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
|
|
>>>>>>> master
|
|
==== tests/cases/compiler/es6-declaration-amd.ts (0 errors) ====
|
|
|
|
class A
|
|
{
|
|
constructor ()
|
|
{
|
|
|
|
}
|
|
|
|
public B()
|
|
{
|
|
return 42;
|
|
}
|
|
} |