J. Ryan Stinnett a0c3295eed 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

2020-05-07 11:29:38 +01:00

..

conf_distributions

Add a default Linux distribution

2020-04-28 11:49:29 +01:00

config.json

Remove cross-signing feature flag because it's not a feature

2020-04-24 10:19:33 -06:00

control.template

Remove Conflicts from riot-desktop

2020-05-07 11:29:38 +01:00