CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-31 13:39:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #151 from EdwardBetts/spelling

Browse Source 
Correct spelling mistakes
This commit is contained in:
J. Ryan Stinnett 2020-11-16 13:27:47 +00:00 committed by GitHub
commit 302f25054a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -396,7 +396,7 @@ Changes in [1.6.0-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v
[\#57](https://github.com/vector-im/riot-desktop/pull/57) [\#57](https://github.com/vector-im/riot-desktop/pull/57)
* Remove welcome user from config * Remove welcome user from config
[\#56](https://github.com/vector-im/riot-desktop/pull/56) [\#56](https://github.com/vector-im/riot-desktop/pull/56)
* electron-main: Immediatelly set the eventIndex variable to null when * electron-main: Immediately set the eventIndex variable to null when
closing. closing.
[\#55](https://github.com/vector-im/riot-desktop/pull/55) [\#55](https://github.com/vector-im/riot-desktop/pull/55)
* Enable Seshat on Nightly * Enable Seshat on Nightly

2
src/electron-main.js
View File

@ -182,7 +182,7 @@ async function setupGlobals() {
vectorConfig = require(asarPath + 'config.json'); vectorConfig = require(asarPath + 'config.json');
} catch (e) { } catch (e) {
// it would be nice to check the error code here and bail if the config // it would be nice to check the error code here and bail if the config
// is unparseable, but we get MODULE_NOT_FOUND in the case of a missing // is unparsable, but we get MODULE_NOT_FOUND in the case of a missing
// file or invalid json, so node is just very unhelpful. // file or invalid json, so node is just very unhelpful.
// Continue with the defaults (ie. an empty config) // Continue with the defaults (ie. an empty config)
vectorConfig = {}; vectorConfig = {};