summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a28d73d9546f..34b73b29cee7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -27,7 +27,6 @@ pkgbase = slurm-llnl-git
optdepends = gtk2: enables the sview command, a simple graphical frontend
provides = slurm-llnl=17.02.0.0pre2.r683.g4589be047d
conflicts = slurm-llnl
- conflicts = slurm-llnl-dev
backup = etc/default/slurm-llnl
source = slurm-tmpfiles.conf
source = slurm-llnl-default-conf
diff --git a/PKGBUILD b/PKGBUILD
index 683da8064de6..dcab8af07520 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,7 +27,7 @@ optdepends=("hwloc: enables the task/cgroup plugin"
"gtk2: enables the sview command, a simple graphical frontend")
makedepends=('python' 'git')
provides=("slurm-llnl=${pkgver}")
-conflicts=('slurm-llnl' 'slurm-llnl-dev')
+conflicts=('slurm-llnl')
backup=('etc/default/slurm-llnl')
install="${pkgname}.install"
source=("slurm-tmpfiles.conf"