Remove unneeded conflict with cpuminer-multi-git

2 files changed, 3 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9b3a79c7b07..3fcbff5f1552 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cpuminer-multi
 	pkgdesc = Multi-algo CPUMiner & Reference Cryptonote Miner (JSON-RPC 2.0)
 	pkgver = 1.3.7
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/tpruvot/cpuminer-multi
 	arch = x86_64
 	license = GPL
@@ -10,7 +10,6 @@ pkgbase = cpuminer-multi
 	depends = openssl
 	provides = cpuminer
 	conflicts = cpuminer
-	conflicts = cpuminer-multi-git
 	source = cpuminer-multi-1.3.7.tar.gz::https://github.com/tpruvot/cpuminer-multi/archive/6d51b16863064e2d42bc87f2ad6ccee30a454102.tar.gz
 	sha256sums = 822a64d508fdec94d7076ba189f0e1c6a453d8a0edac3d9c45bd25f7f521bbf3
 
diff --git a/PKGBUILD b/PKGBUILD
index ec3dc6432599..1f897ba17fa1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
 pkgname=cpuminer-multi
 _commit=6d51b16863064e2d42bc87f2ad6ccee30a454102
 pkgver=1.3.7
-pkgrel=2
+pkgrel=3
 pkgdesc='Multi-algo CPUMiner & Reference Cryptonote Miner (JSON-RPC 2.0)'
 arch=('x86_64')
 url="https://github.com/tpruvot/$pkgname"
 license=('GPL')
 depends=('curl' 'jansson' 'openssl')
 provides=('cpuminer')
-conflicts=('cpuminer' 'cpuminer-multi-git')
+conflicts=('cpuminer')
 #source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver-multi.tar.gz")
 source=("$pkgname-$pkgver.tar.gz::$url/archive/$_commit.tar.gz")
 sha256sums=('822a64d508fdec94d7076ba189f0e1c6a453d8a0edac3d9c45bd25f7f521bbf3')