Skip to content

Commit f893a0d

Browse files
committed
Merge branch 'dev' into alex/workspace-fix
2 parents 057cd57 + 54641d9 commit f893a0d

File tree

8 files changed

+616
-619
lines changed

8 files changed

+616
-619
lines changed

main.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
const extraca = require("fs").readFileSync(process.env.NODE_EXTRA_CA_CERTS);
88
}catch(e){
99
return;
10-
}
11-
10+
}
11+
1212
const NativeSecureContext = process.binding('crypto').SecureContext;
1313
const oldaddRootCerts = NativeSecureContext.prototype.addRootCerts;
1414
NativeSecureContext.prototype.addRootCerts = function(){
@@ -226,7 +226,7 @@ const sendStatusToWindow = (text) => {
226226
ipcMain.on('login-via-github', async () => {
227227
const url = `http://github.com/login/oauth/authorize?scope=repo&redirect_uri=http://localhost:3000/signup/github/callback/&client_id=6e9d37a09ab8bda68d50` // ${process.env.GITHUB_CLIENT_ID};
228228
await shell.openExternal(url, { activate: true });
229-
229+
230230
})
231231

232232
ipcMain.on('check-for-update', () => {
@@ -319,7 +319,7 @@ ipcMain.on('import-from-github', async (event, args) => {
319319

320320
console.log('main.js import-from-github args', args);
321321

322-
// requiring typescript type Workspace makes sanitation uncessesary
322+
// requiring typescript type Workspace makes sanitation uncessesary
323323
const ids = {};
324324
let index = 0;
325325
const newCollectionArr = []

0 commit comments

Comments
 (0)