From a0c3295eedbfe7da5421d0cbb488b5e45be8d9bb Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 7 May 2020 11:27:03 +0100
Subject: [PATCH] Remove Conflicts from riot-desktop

Some early testing suggests removing this will allow the install of the riot-web
transitional package to proceed.

Part of https://github.com/vector-im/riot-web/issues/13509
---
 riot.im/release/control.template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/riot.im/release/control.template b/riot.im/release/control.template
index 50d6162e..4482b276 100644
--- a/riot.im/release/control.template
+++ b/riot.im/release/control.template
@@ -5,7 +5,6 @@ Architecture: amd64
 Maintainer: support@riot.im
 Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0, libsqlcipher0
 Provides: riot-web
-Conflicts: riot-web
 Replaces: riot-web
 Section: net
 Priority: extra