diff options
| author | Marcel Radzio | 2018-07-01 21:56:24 +0200 |
|---|---|---|
| committer | Marcel Radzio | 2018-07-01 21:56:24 +0200 |
| commit | c53f418b3c739f0156ef0449ee444eeda07da6b6 (patch) | |
| tree | b265d02a2dad5aac12f3d2c18e0b491ef3925c1f | |
| parent | afa1a6a990d78037909c38ac5cade507ff129204 (diff) | |
| download | aur-c53f418b3c739f0156ef0449ee444eeda07da6b6.tar.gz | |
add riot-web to the conflicts
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -1,6 +1,6 @@ pkgbase = riot-desktop-git pkgdesc = A glossy Matrix collaboration client for the desktop. - pkgver = v0.15.1.r0.g4e6c2fdd + pkgver = v0.15.6.r3.gc08f31aa pkgrel = 1 url = https://riot.im arch = any @@ -9,7 +9,7 @@ pkgbase = riot-desktop-git makedepends = npm depends = electron provides = riot-desktop - conflicts = riot-desktop + conflicts = riot-desktop 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 @@ -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' |