Remove electron and resolve yarn.lock conflict

2021-02-09 10:32:27 -06:00 · 2021-02-09 10:32:27 -06:00 · 80d50057fc
parent 0a1a8fe4fe
commit 80d50057fc
2 changed files with 14 additions and 568 deletions
--- a/lib/vscode/package.json
+++ b/lib/vscode/package.json
@ -120,11 +120,6 @@
    "css-loader": "^3.2.0",
    "debounce": "^1.0.0",
    "deemon": "^1.4.0",
-<<<<<<< HEAD
-=======
-    "electron": "9.3.5",
-    "electron-rebuild": "2.0.3",
->>>>>>> e4a830e9b7ca039c7c70697786d29f5b6679d775
    "eslint": "6.8.0",
    "eslint-plugin-jsdoc": "^19.1.0",
    "eslint-plugin-mocha": "8.0.0",
--- a/lib/vscode/yarn.lock
+++ b/lib/vscode/yarn.lock