microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-18 07:29:16 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Accept baseline tests. Fixing diagnosticMessages.json (merge result not included in prior commit).

Browse Source
This commit is contained in:
about-code
2016-11-05 18:42:53 +01:00
parent 8fa07d695e
commit 189dbddb10
8 changed files with 57 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/diagnosticMessages.json
View File

@@ -1979,18 +1979,14 @@
"category": "Error",
"code": 2696
},
<<<<<<< HEAD
"Static property '{0}' conflicts with built-in property 'Function.{0}' of constructor function '{1}'.": {
"category": "Error",
"code": 2699
},
=======
"An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option.": {
"category": "Error",
"code": 2697
},
>>>>>>> upstream/master
"Static property '{0}' conflicts with built-in property 'Function.{0}' of constructor function '{1}'.": {
"category": "Error",
"code": 2699
},
"Import declaration '{0}' is using private name '{1}'.": {
"category": "Error",
"code": 4000