Merge branch 'master' into electron-6.0.x

microsoft · Jul 12, 2019 · 0a6293a · 0a6293a
2 parents 266b5c7 + 5faf378
commit 0a6293a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 408 deletions.
diff --git a/remote/package.json b/remote/package.json
@@ -9,7 +9,6 @@
     "https-proxy-agent": "^2.2.1",
     "iconv-lite": "0.5.0",
     "jschardet": "1.6.0",
-    "keytar": "^4.11.0",
     "minimist": "1.2.0",
     "native-watchdog": "1.0.0",
     "node-pty": "0.9.0-beta19",