summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuan Guo2018-06-18 22:22:50 +0800
committerQuan Guo2018-06-18 22:22:50 +0800
commit6f25f1c349c3fc3d31e22c6cf68e644f5697a3fb (patch)
tree866243ffd564ada82c54d7485ec56ef9e26570a7
parenta5911b54d867fcb56891cd78f39a85b2608df006 (diff)
downloadaur-6f25f1c349c3fc3d31e22c6cf68e644f5697a3fb.tar.gz
Update the conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD1
2 files changed, 4 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7c835b2afdf4..a5660462c57e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Jun 18 14:13:32 UTC 2018
+# Mon Jun 18 14:22:44 UTC 2018
pkgbase = cheat-git
pkgdesc = Cheat allows you to create and view interactive cheatsheets on the command-line
pkgver = 2.2.3
@@ -12,6 +12,8 @@ pkgbase = cheat-git
depends = python2-docopt
optdepends = python2-pygments
optdepends = bash-completion
+ conflicts = cheat-bash-git
+ conflicts = python-cheat
source = cheat-git::git+https://github.com/chrisallenlane/cheat.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fb6ec4ee59b5..e83308e9dec6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,6 +12,7 @@ url="https://github.com/chrisallenlane/cheat"
depends=('python2' 'python2-docopt')
optdepends=('python2-pygments' 'bash-completion')
makedepends=('git')
+conflicts=('cheat-bash-git' 'python-cheat')
source=("$pkgname::git+https://github.com/chrisallenlane/cheat.git")
md5sums=('SKIP')