From 28fe7f40b04c913cd1555147aef5d34bf3b79293 Mon Sep 17 00:00:00 2001
From: overtake <>
Date: Tue, 25 Jun 2019 18:39:41 +0200
Subject: [PATCH] some merge fixes

---
 .../TelegramPresentationData/Sources/ComponentsThemes.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift b/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift
index 6e83f7453b..16d556faed 100644
--- a/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift
+++ b/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift
@@ -59,7 +59,7 @@ public extension NavigationControllerTheme {
     convenience init(presentationTheme: PresentationTheme) {
         self.init(navigationBar: NavigationBarTheme(rootControllerTheme: presentationTheme), emptyAreaColor: presentationTheme.chatList.backgroundColor)
     }
-    convenience public init(presentationTheme: PresentationTheme) {
-        self.init(navigationBar: NavigationBarTheme(rootControllerTheme: presentationTheme), emptyAreaColor: presentationTheme.chatList.backgroundColor, emptyDetailIcon: generateTintedImage(image: UIImage(named: "Chat List/EmptyMasterDetailIcon", in: Bundle(for: PresentationTheme.self), compatibleWith: nil), color: presentationTheme.chatList.messageTextColor.withAlphaComponent(0.2)))
-    }
+//    convenience public init(presentationTheme: PresentationTheme) {
+//        self.init(navigationBar: NavigationBarTheme(rootControllerTheme: presentationTheme), emptyAreaColor: presentationTheme.chatList.backgroundColor, emptyDetailIcon: generateTintedImage(image: UIImage(named: "Chat List/EmptyMasterDetailIcon", in: Bundle(for: PresentationTheme.self), compatibleWith: nil), color: presentationTheme.chatList.messageTextColor.withAlphaComponent(0.2)))
+//    }
 }