From 8b60fe9fffcbfce467941b0fdbdb85ee1632d2c2 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Fri, 8 Mar 2019 09:52:55 +0000
Subject: [PATCH] Remove merge markers

---
 src/vector/platform/ElectronPlatform.js | 4 ----
 1 file changed, 4 deletions(-)

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