Clean up conflicts

As kindly pointed out by @willemw the additional 'vimiv-git' and
'vimiv-qt' in conflicts are redundant as all of these packages provide
'vimiv'.

2 files changed, 3 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0834308d6f65..0de141cea9e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vimiv-qt-git
 	pkgdesc = An image viewer with vim-like keybindings
-	pkgver = r2066.41d9382d
+	pkgver = r2155.f8fb0017
 	pkgrel = 1
 	url = https://github.com/karlch/vimiv-qt
 	arch = any
@@ -14,8 +14,6 @@ pkgbase = vimiv-qt-git
 	optdepends = python-piexif: alternative for exif support
 	provides = vimiv
 	conflicts = vimiv
-	conflicts = vimiv-git
-	conflicts = vimiv-qt
 	source = vimiv-qt-git::git+https://github.com/karlch/vimiv-qt.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index b87a210075f4..9b885106d100 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=vimiv-qt-git
 pkgrel=1
-pkgver=r2066.41d9382d
+pkgver=r2155.f8fb0017
 pkgdesc='An image viewer with vim-like keybindings'
 arch=('any')
 url='https://github.com/karlch/vimiv-qt'
@@ -15,8 +15,8 @@ optdepends=(
     'python-exiv2: for exif support'
     'python-piexif: alternative for exif support'
 )
-conflicts=('vimiv' 'vimiv-git' 'vimiv-qt')
 provides=('vimiv')
+conflicts=('vimiv')
 source=("$pkgname::git+${url}.git")
 md5sums=('SKIP')