nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove merge markers

Browse Source
This commit is contained in:
Andrew Morgan
2019-03-08 09:52:55 +00:00
parent 94b6396e0c
commit 8b60fe9fff
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vector/platform/ElectronPlatform.js
View File

@@ -121,11 +121,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
this.stopUpdateCheck = this.stopUpdateCheck.bind(this); this.stopUpdateCheck = this.stopUpdateCheck.bind(this);
ipcRenderer.on('keybinding-pressed', (event, keybindName) => { ipcRenderer.on('keybinding-pressed', (event, keybindName) => {
<<<<<<< HEAD
// Prevent holding down a shortcut meaning multiple presses // Prevent holding down a shortcut meaning multiple presses
=======
// Prevent holding down a shortcut meaning multiple presses
>>>>>>> fa72152a96b083180efbda662f9b0eb9f720e0b2
if (globalKeybindings[keybindName].pressed) { if (globalKeybindings[keybindName].pressed) {
return; return;
} }