OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

feat(lib/vscode): update src/vs/base/node/languagePacks.js

Browse Source 
It looks like a couple functions were added here
such as a readFile and writeFile.
This commit is contained in:
Joe Previte 2021-03-11 10:47:52 -07:00
parent 548b6fb628
commit e79ca99466
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vscode/src/vs/base/node/languagePacks.js
View File

@ -78,7 +78,6 @@
// Do nothing. If we can't read the file we have no // Do nothing. If we can't read the file we have no
// language pack config. // language pack config.
} }
<<<<<<< HEAD
}, err => { }, err => {
if (err.code === 'ENOENT') { if (err.code === 'ENOENT') {
return undefined; return undefined;
@ -131,9 +130,6 @@
} catch (err) { } catch (err) {
// Do nothing. If we can't read the file we have no // Do nothing. If we can't read the file we have no
// language pack config. // language pack config.
=======
return undefined;
>>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384
} }
/** /**