Fix some merge conflicts and up to electron 4.2.6

This commit is contained in:
Andrew Morgan 2019-07-12 17:39:31 +01:00
parent b7781ab503
commit f4a7f0dedd
5 changed files with 336 additions and 23 deletions

View file

@ -15,12 +15,12 @@
},
"cmake-js": {
"runtime": "electron",
"runtimeVersion": "4.1.3"
"runtimeVersion": "4.2.6"
},
"supportedTargets": [
[
"electron",
"4.1.3",
"4.2.6",
"69"
]
]