update Electron; make positron/electron submodule track master branch

mozilla · Oct 4, 2016 · a4d1dcd · a4d1dcd
1 parent a54e742
commit a4d1dcd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,7 @@
 [submodule "positron/electron"]
 	path = positron/electron
 	url = https://github.com/mozilla/positron-electron.git
+	branch = master
 [submodule "positron/spidernode"]
 	path = positron/spidernode
 	url = https://github.com/mozilla/positron-spidernode.git

diff --git a/positron/electron b/positron/electron
+1 −6		lib/browser/api/web-contents.js
+1 −6		lib/renderer/api/remote.js