summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKobus van Schoor2016-05-31 18:02:00 +0200
committerKobus van Schoor2016-05-31 18:02:00 +0200
commitbaafd2bf40fc44447891c49147f53fd8c4efecf3 (patch)
treeffa00ff7f4136304d858a775ec2624c81b38f765
parentccacee7ebf47d17874459abba1d3c6f9d817ae06 (diff)
downloadaur-baafd2bf40fc44447891c49147f53fd8c4efecf3.tar.gz
Added conflict
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD1
2 files changed, 3 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f5910a8d8f43..270fc3a365e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue May 31 15:48:44 UTC 2016
+# Tue May 31 16:01:49 UTC 2016
pkgbase = dotgit-git
pkgdesc = Development version of dotgit
pkgver = 31.05.2016
@@ -10,6 +10,7 @@ pkgbase = dotgit-git
depends = sed
depends = grep
depends = bash
+ conflicts = dotgit
source = git+https://github.com/Cube777/dotgit.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index d65fb6a4a437..f3f4c2128ae3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,6 +6,7 @@ pkgdesc="Development version of dotgit"
url="http://github.com/Cube777/dotgit"
arch=('any')
depends=('git' 'sed' 'grep' 'bash' )
+conflicts=('dotgit')
source=('git+https://github.com/Cube777/dotgit.git')
md5sums=('SKIP')