2 files changed, 1 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34351c14b0f2..39812d624157 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,7 +26,6 @@ pkgbase = slurm-llnl-dev
 	optdepends = gtk2: enables the sview command, a simple graphical frontend
 	provides = slurm-llnl=17.02.0_0pre4
 	conflicts = slurm-llnl
-	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 c9fecb2021f8..f48e93ba12c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,7 +30,7 @@ optdepends=("hwloc: enables the task/cgroup plugin"
 	"gtk2: enables the sview command, a simple graphical frontend")
 makedepends=('python')
 provides=("slurm-llnl=${pkgver}")
-conflicts=('slurm-llnl' 'slurm-llnl-git')
+conflicts=('slurm-llnl')
 backup=('etc/default/slurm-llnl')
 install="${pkgname}.install"
 source=("slurm-tmpfiles.conf"