From 5e043812ef2e843b6ca773ad5a94960f429bfb64 Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <nornagon@nornagon.net>
Date: Fri, 11 Jan 2019 16:25:34 -0800
Subject: [PATCH] fix HandleKeyboardEvent merge failure

---
 atom/browser/common_web_contents_delegate_mac.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/common_web_contents_delegate_mac.mm b/atom/browser/common_web_contents_delegate_mac.mm
index 1611e156c0..a1d7b3e5ed 100644
--- a/atom/browser/common_web_contents_delegate_mac.mm
+++ b/atom/browser/common_web_contents_delegate_mac.mm
@@ -27,7 +27,7 @@ bool CommonWebContentsDelegate::HandleKeyboardEvent(
   // Escape exits tabbed fullscreen mode.
   if (event.windows_key_code == ui::VKEY_ESCAPE && is_html_fullscreen()) {
     ExitFullscreenModeForTab(source);
-    return;
+    return true;
   }
 
   // Check if the webContents has preferences and to ignore shortcuts