summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Radzio2018-07-02 18:53:47 +0200
committerMarcel Radzio2018-07-02 18:53:47 +0200
commit9f305507f58f39474ca67f15e4d66bb0b336008f (patch)
treef2f17f6b19e7d103b7e7dbba487403b7003b560c
parentc53f418b3c739f0156ef0449ee444eeda07da6b6 (diff)
downloadaur-9f305507f58f39474ca67f15e4d66bb0b336008f.tar.gz
fix the conflicts section
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f984a1ea6b6f..0d77a3d34882 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,8 @@ pkgbase = riot-desktop-git
makedepends = npm
depends = electron
provides = riot-desktop
- conflicts = riot-desktop riot-web
+ conflicts = riot-desktop
+ conflicts = riot-web
backup = etc/riot/config.json
source = riot-desktop-git::git://github.com/vector-im/riot-web.git#branch=develop
source = riot-desktop.desktop
diff --git a/PKGBUILD b/PKGBUILD
index 07d1e0b20bed..79494613fe46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ url="https://riot.im"
license=('Apache')
depends=('electron')
makedepends=('git' 'npm')
-conflicts=('riot-desktop riot-web')
+conflicts=('riot-desktop' 'riot-web')
provides=('riot-desktop')
backup=("etc/riot/config.json")
source=('riot-desktop-git::git://github.com/vector-im/riot-web.git#branch=develop'