fix(lib/vscode): package.json and yarn.lock

No new dependencies were added in the 1.54.2 update.

Author: jsjoeio

lib/vscode/package.json

@@ -132,11 +132,6 @@
     "cssnano": "^4.1.10",
     "debounce": "^1.0.0",
     "deemon": "^1.4.0",
-<<<<<<< HEAD
-=======
-    "electron": "11.3.0",
-    "electron-rebuild": "2.0.3",
->>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384
     "eslint": "6.8.0",
     "eslint-plugin-jsdoc": "^19.1.0",
     "event-stream": "3.3.4",