Merge from vscode 1b314ab317fbff7d799b21754326b7d849889ceb

This commit is contained in:
ADS Merger
2020-07-15 23:51:18 +00:00
parent aae013d498
commit 9d3f12d0b7
554 changed files with 15159 additions and 8223 deletions

View File

@@ -1789,8 +1789,8 @@
"diff"
],
"extensions": [
".patch",
".diff",
".patch",
".rej"
],
"configuration": "./languages/diff.language-configuration.json"
@@ -1878,8 +1878,8 @@
"dependencies": {
"byline": "^5.0.0",
"file-type": "^7.2.0",
"iconv-lite-umd": "0.6.5",
"jschardet": "2.1.1",
"iconv-lite-umd": "0.6.8",
"jschardet": "2.2.1",
"vscode-extension-telemetry": "0.1.1",
"vscode-nls": "^4.0.0",
"vscode-uri": "^2.0.0",