a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove electron and resolve yarn.lock conflict

This commit is contained in:
Asher 2021-02-09 10:32:27 -06:00
parent 0a1a8fe4fe
commit 80d50057fc
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
2 changed files with 14 additions and 568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/vscode/package.json
View File

@ -120,11 +120,6 @@
"css-loader": "^3.2.0", "css-loader": "^3.2.0",
"debounce": "^1.0.0", "debounce": "^1.0.0",
"deemon": "^1.4.0", "deemon": "^1.4.0",
<<<<<<< HEAD
=======
"electron": "9.3.5",
"electron-rebuild": "2.0.3",
>>>>>>> e4a830e9b7ca039c7c70697786d29f5b6679d775
"eslint": "6.8.0", "eslint": "6.8.0",
"eslint-plugin-jsdoc": "^19.1.0", "eslint-plugin-jsdoc": "^19.1.0",
"eslint-plugin-mocha": "8.0.0", "eslint-plugin-mocha": "8.0.0",

577
lib/vscode/yarn.lock
View File

File diff suppressed because it is too large Load Diff