summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjon noble2019-10-16 10:28:28 +0100
committerjon noble2019-10-16 10:28:28 +0100
commita0e89c62685b055d9a6be1ee8ed0356e913b9262 (patch)
treeecfcc32cb44c2ec97f551b49fadd3007d6aae30e
parenta488fae9aef925b1c35e3793296792e67a0b0299 (diff)
downloadaur-a0e89c62685b055d9a6be1ee8ed0356e913b9262.tar.gz
fixing conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6729468dddb3..ff640f0c59c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,6 @@ pkgbase = halide-git
depends = llvm>=8.0
depends = cmake>=3.8
provides = halide-git
- conflicts = halide-git
conflicts = halide-bin
source = git+https://github.com/halide/Halide.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 15fa96854232..7fba5e8a0751 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ groups=()
depends=('llvm>=8.0' 'cmake>=3.8')
makedepends=('git')
provides=("${pkgname%-VCS}")
-conflicts=("${pkgname%-VCS}" "halide-bin")
+conflicts=("halide-bin")
replaces=()
backup=()
options=()