summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack O'Sullivan2019-02-05 22:04:39 +0000
committerJack O'Sullivan2019-02-05 22:04:39 +0000
commit53fbdb9f0dfcdf418e3b92afe10a50e65e028309 (patch)
treeb5e09f9ede5b5f8b5e045cf5beac6aa73523e23e
parent8e632a1e3631a2635b9b53c7eed7ad6d4587d6bb (diff)
downloadaur-53fbdb9f0dfcdf418e3b92afe10a50e65e028309.tar.gz
Update conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1580fbe6abd6..f7502009f6e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,7 +8,7 @@ pkgbase = riot-web-develop-git
makedepends = npm
makedepends = git
provides = vector-web
- conflicts = riot-web
+ conflicts = vector-web
replaces = vector-web
source = git+https://github.com/vector-im/riot-web#branch=develop
source = fetch-deps.patch
diff --git a/PKGBUILD b/PKGBUILD
index 091dcf20f987..5a2f6e8c5525 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ sha256sums=('SKIP'
'd6428c19067f447a051bedf49a28686c5e60ab3bbb3534065889584e28f61cf5')
provides=('vector-web') # @vith
replaces=('vector-web') # @vith
-conflicts=('riot-web')
+conflicts=('vector-web')
pkgver() {
cd "$_pkgname"