summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2020-04-07 16:36:32 -0600
committerMark Wagie2020-04-07 16:36:32 -0600
commitdadb2210688dddcb534e725d6235310c35d05b6f (patch)
tree071a501d68674968afe40002b1bfffc8b003f6d8
parent83230412a880b966b8244dc5242da56d071642f1 (diff)
downloadaur-dadb2210688dddcb534e725d6235310c35d05b6f.tar.gz
adjust conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7fdedd1795d2..f553c8343bcd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,7 +17,6 @@ pkgbase = cheat
optdepends = fish: for fish completions
conflicts = python-cheat
conflicts = cheat-bash-git
- conflicts = cheat-git
replaces = python-cheat
backup = etc/cheat/conf.yml
source = cheat-3.8.0.tar.gz::https://github.com/cheat/cheat/archive/3.8.0.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 98bc18a0e3cf..fa223e1926b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ makedepends=('go-pie' 'git' 'pandoc')
optdepends=('bash-completion: for bash completions'
'fzf: Fuzzy Finder integration for bash-completion'
'fish: for fish completions')
-conflicts=("python-$pkgname" "$pkgname-bash-git" "$pkgname-git")
+conflicts=("python-$pkgname" "$pkgname-bash-git")
replaces=("python-$pkgname")
backup=("etc/$pkgname/conf.yml")
source=("$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz"