Update conflicts

2 files changed, 2 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8b11b926c11..7437cb870e0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python2-vmaf
 	pkgdesc = Perceptual video quality assessment algorithm based on multi-method fusion (python2 implementation)
 	pkgver = 1.3.9
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/netflix/vmaf/
 	arch = any
 	license = APACHE
@@ -15,7 +15,6 @@ pkgbase = python2-vmaf
 	depends = python2-scikit-learn
 	depends = python2-h5py
 	depends = python2-scikit-image
-	conflicts = python2-vmaf-git
 	source = vmaf-1.3.9.tar.gz::https://github.com/Netflix/vmaf/archive/v1.3.9.tar.gz
 	source = vmaf-submodule-sureal::git+https://github.com/Netflix/sureal.git#commit=4d0fee6e83047da53ff1776a883579bfe101e8ea
 	sha256sums = c9e4fc850f66cf959a36c9603cef26c4298eec20d6c26f9482a355c5753c092d
diff --git a/PKGBUILD b/PKGBUILD
index c6a1b68c0bb7..709492740dd0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _sureal_commit='4d0fee6e83047da53ff1776a883579bfe101e8ea'
 
 pkgname=python2-vmaf
 pkgver=1.3.9
-pkgrel=2
+pkgrel=3
 pkgdesc='Perceptual video quality assessment algorithm based on multi-method fusion (python2 implementation)'
 arch=('any')
 url='https://github.com/netflix/vmaf/'
@@ -18,7 +18,6 @@ depends=(
         'python2-scikit-image'
 )
 makedepends=('git' 'python2-setuptools')
-conflicts=('python2-vmaf-git')
 source=("${_srcname}-${pkgver}.tar.gz"::"https://github.com/Netflix/${_srcname}/archive/v${pkgver}.tar.gz"
         'vmaf-submodule-sureal'::"git+https://github.com/Netflix/sureal.git#commit=${_sureal_commit}")
 sha256sums=('c9e4fc850f66cf959a36c9603cef26c4298eec20d6c26f9482a355c5753c092d'