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, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 559b475d35ff..a9c58b015267 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -24,8 +24,6 @@ pkgbase = slurm-llnl
 	optdepends = numactl: NUMA support in the task/affinity plugin
 	optdepends = ncurses: adds the smap command
 	optdepends = gtk2: enables the sview command, a simple graphical frontend
-	conflicts = slurm-llnl-dev
-	conflicts = slurm-llnl-git
 	backup = etc/default/slurm-llnl
 	source = slurm-tmpfiles.conf
 	source = slurm-llnl-default-conf
diff --git a/PKGBUILD b/PKGBUILD
index b9a658e3c56f..e04782247909 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,7 +26,6 @@ optdepends=("hwloc: enables the task/cgroup plugin"
 	"ncurses: adds the smap command "
 	"gtk2: enables the sview command, a simple graphical frontend")
 makedepends=('python')
-conflicts=('slurm-llnl-dev' 'slurm-llnl-git')
 backup=('etc/default/slurm-llnl')
 install="${pkgname}.install"
 source=("slurm-tmpfiles.conf"