From a2786a1401f20c1440b4498a3033bbebdbd921fc Mon Sep 17 00:00:00 2001
From: overtake <>
Date: Tue, 11 Jun 2019 19:03:58 +0200
Subject: [PATCH] merge fix

---
 TelegramUI/ChatController.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TelegramUI/ChatController.swift b/TelegramUI/ChatController.swift
index 20e1763f40..8cefdc0761 100644
--- a/TelegramUI/ChatController.swift
+++ b/TelegramUI/ChatController.swift
@@ -83,7 +83,7 @@ private func isTopmostChatController(_ controller: ChatController) -> Bool {
 
 let ChatControllerCount = Atomic<Int32>(value: 0)
 
-public final class ChatController: TelegramController, KeyShortcutResponder, GalleryHiddenMediaTarget, UIDropInteractionDelegate {
+public final class ChatController: TelegramController, GalleryHiddenMediaTarget, UIDropInteractionDelegate {
     private var validLayout: ContainerViewLayout?
     
     weak var parentController: ViewController?
@@ -6613,7 +6613,7 @@ public final class ChatController: TelegramController, KeyShortcutResponder, Gal
         }
     }
     
-    public var keyShortcuts: [KeyShortcut] {
+    public override var keyShortcuts: [KeyShortcut] {
         let strings = self.presentationData.strings
         
         var inputShortcuts: [KeyShortcut]