summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordian Edenhofer2016-10-21 17:04:59 +0200
committerGordian Edenhofer2016-10-21 17:04:59 +0200
commitb65b02e5e4d364757fecf26c1d569534a19354f0 (patch)
tree7ec27cf4be10f509a7e959e878b73c73e6f1890d
parentfd397bf3a9c73103df9ac25d7b8bf6c4541f33ff (diff)
downloadaur-b65b02e5e4d364757fecf26c1d569534a19354f0.tar.gz
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
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD1
2 files changed, 0 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 559b475d35f..a9c58b01526 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 b9a658e3c56..e0478224790 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"