From e79ca9946670813e2ef8954ee6da63e70d43097c Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 11 Mar 2021 10:47:52 -0700 Subject: [PATCH] feat(lib/vscode): update src/vs/base/node/languagePacks.js It looks like a couple functions were added here such as a readFile and writeFile. --- lib/vscode/src/vs/base/node/languagePacks.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/vscode/src/vs/base/node/languagePacks.js b/lib/vscode/src/vs/base/node/languagePacks.js index d872d93e5..9f21be50c 100644 --- a/lib/vscode/src/vs/base/node/languagePacks.js +++ b/lib/vscode/src/vs/base/node/languagePacks.js @@ -78,7 +78,6 @@ // Do nothing. If we can't read the file we have no // language pack config. } -<<<<<<< HEAD }, err => { if (err.code === 'ENOENT') { return undefined; @@ -131,9 +130,6 @@ } catch (err) { // Do nothing. If we can't read the file we have no // language pack config. -======= - return undefined; ->>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384 } /**