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

zhengbli · zhengbli · commit 5ced4c401f97 · 2016-01-27T15:20:16.000-08:00
diff --git a/tests/baselines/reference/asyncImportedPromise_es6.errors.txt b/tests/baselines/reference/asyncImportedPromise_es6.errors.txt
@@ -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.
     }

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