From 9a71f458ea1c92d5e27901a064080254b9a4ad5b5516d28d2b9109cf055ea396 Mon Sep 17 00:00:00 2001
From: Xu Zhao <i@xuzhao.net>
Date: Tue, 25 Dec 2018 03:28:49 +0000
Subject: [PATCH] Accepting request 661299 from
 home:nuklly:branches:server:messaging

Fixed bugs in patch

OBS-URL: https://build.opensuse.org/request/show/661299
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=58
---
 tdesktop.patch | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tdesktop.patch b/tdesktop.patch
index 4655dcf..259e562 100644
--- a/tdesktop.patch
+++ b/tdesktop.patch
@@ -7,11 +7,7 @@ Index: tdesktop-1.2.6/Telegram/Resources/qrc/telegram_linux.qrc
    <qresource prefix="/qt">
 -    <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
    </qresource>
-<<<<<<< ./tdesktop.patch.mine
- </RCC>
-=======
    <qresource prefix="/fc">
->>>>>>> ./tdesktop.patch.rc44a18716743178f1d760ce699dba268
 Index: tdesktop-1.2.6/Telegram/SourceFiles/qt_functions.cpp
 ===================================================================
 --- /dev/null