Remove duplicate conflict field

upgpkg: grive 0.5.0-4
upgpkg: munge 0.5.12-1
upgpkg: pcc 1.1.0-1
upgpkg: pcc-libs 1.1.0-1
upgpkg: routersploit 2.2.1-1
upgpkg: slurm-llnl 16.05.5-1

2 files changed, 0 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e8f33d424d6..eea3758b5bdf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,6 @@ pkgbase = munge
 	depends = openssl
 	optdepends = zlib: zlib compression support
 	optdepends = bzip2: bzip2 compression support
-	conflicts = munge-git
 	source = https://github.com/dun/munge/archive/munge-0.5.12.tar.gz
 	md5sums = 3e10b37d509025b49dda4f49c4c81c76
 
diff --git a/PKGBUILD b/PKGBUILD
index b0fff14af6e5..1d3b86a1c4be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,6 @@ license=('GPL3' 'LGPL3')
 depends=('openssl')
 optdepends=("zlib: zlib compression support"
 	"bzip2: bzip2 compression support")
-conflicts=('munge-git')
 install="${pkgname}.install"
 source=("https://github.com/dun/munge/archive/${pkgname}-${pkgver}.tar.gz")
 md5sums=('3e10b37d509025b49dda4f49c4c81c76')