gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove more merge markers

This commit is contained in:
Andrew Morgan 2019-03-08 10:26:51 +00:00
parent 8b60fe9fff
commit 600b8690d7
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,8 +249,6 @@ export default class ElectronPlatform extends VectorBasePlatform {
ipcRenderer.send('check_updates'); ipcRenderer.send('check_updates');
} }
<<<<<<< HEAD
=======
startListeningKeys() { startListeningKeys() {
// Tell iohook to start listening for key events // Tell iohook to start listening for key events
ipcRenderer.send('start-listening-keys'); ipcRenderer.send('start-listening-keys');
@ -274,7 +272,6 @@ export default class ElectronPlatform extends VectorBasePlatform {
ipcRenderer.on('window-blurred', callback); ipcRenderer.on('window-blurred', callback);
} }
>>>>>>> fa72152a96b083180efbda662f9b0eb9f720e0b2
addGlobalKeybinding(keybindName: string, keybindCode: string, callback: () => void, releaseCallback: () => void) { addGlobalKeybinding(keybindName: string, keybindCode: string, callback: () => void, releaseCallback: () => void) {
// Add a keybinding that works even when the app is minimized // Add a keybinding that works even when the app is minimized
const keybinding = {name: keybindName, code: keybindCode}; const keybinding = {name: keybindName, code: keybindCode};