2 files changed, 1 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eea75dfd531a..ec8de4bd65af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Dec  8 04:27:58 UTC 2015
+# Tue Dec  8 10:05:51 UTC 2015
 pkgbase = solr5-zip
 	pkgdesc = Popular, blazing fast open source enterprise search platform from the Apache Lucene project
 	pkgver = 5.3.1
@@ -11,7 +11,6 @@ pkgbase = solr5-zip
 	depends = java-environment>=7
 	provides = solr=5
 	provides = solr5=5
-	conflicts = solr
 	noextract = http://www.apache.org/dist/lucene/solr/5.3.1/solr-5.3.1.zip
 	source = http://www.apache.org/dist/lucene/solr/5.3.1/solr-5.3.1.zip
 	md5sums = c69eb24acb3821408eacf00651cc7022
diff --git a/PKGBUILD b/PKGBUILD
index 24c921fc46ad..344c14f82114 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,6 @@ url="http://lucene.apache.org/$_pkgname"
 license=('Apache')
 depends=('java-environment>=7')
 provides=("$_pkgname=5" "${_pkgname}5=5")
-conflicts=("$_pkgname")
 install="$pkgname.install"
 source=("http://www.apache.org/dist/lucene/$_pkgname/$pkgver/$_pkgname-$pkgver.zip")
 md5sums=('c69eb24acb3821408eacf00651cc7022')