summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorMarcel Radzio2018-07-01 21:56:24 +0200
committerMarcel Radzio2018-07-01 21:56:24 +0200
commitc53f418b3c739f0156ef0449ee444eeda07da6b6 (patch)
treeb265d02a2dad5aac12f3d2c18e0b491ef3925c1f /PKGBUILD
parentafa1a6a990d78037909c38ac5cade507ff129204 (diff)
downloadaur-c53f418b3c739f0156ef0449ee444eeda07da6b6.tar.gz
add riot-web to the conflicts
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 33099522a664..07d1e0b20bed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Marcel Radzio <info@nordgedanken.de>
pkgbase=riot-desktop-git
-pkgver=v0.15.1.r0.g4e6c2fdd
+pkgver=v0.15.6.r3.gc08f31aa
pkgrel=1
pkgname=riot-desktop-git
pkgdesc="A glossy Matrix collaboration client for the desktop."
@@ -9,7 +9,7 @@ url="https://riot.im"
license=('Apache')
depends=('electron')
makedepends=('git' 'npm')
-conflicts=('riot-desktop')
+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'