Merge branch 'master' of https://github.com/Microsoft/TypeScript into fixFindAllRefForSalsa

This commit is contained in:
zhengbli 2016-01-27 15:20:16 -08:00
commit 5ced4c401f

View file

@ -9,5 +9,5 @@ tests/cases/conformance/async/es6/test.ts(3,25): error TS1064: The return type o
class Test {
async example<T>(): Task<T> { return; }
~~~~~~~
!!! error TS1064: The return type of an async function or method must be the global Promise<T>.
!!! error TS1064: The return type of an async function or method must be the global Promise<T> type.
}