summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD1
2 files changed, 1 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d91648516e6..0fd5c89a74d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Fri Nov 3 03:11:48 UTC 2017
+# Fri Nov 3 03:12:23 UTC 2017
pkgbase = kaa-base
pkgdesc = KAA base package
pkgver = 0.99.2+481+c9a28525
@@ -11,7 +11,6 @@ pkgbase = kaa-base
makedepends = git
depends = python2
depends = glib2
- conflicts = kaa-base
source = kaa-base::git+https://github.com/freevo/kaa-base#commit=c9a28525f0ca39546c72f1fd232812d514c631eb
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 4a9bdcdfce5..0bed1e45bf1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,6 @@ url="http://freevo.sourceforge.net/"
license=('GPL2')
depends=('python2' 'glib2')
makedepends=('git')
-conflicts=("${pkgname}")
arch=('i686' 'x86_64')
_commit='c9a28525f0ca39546c72f1fd232812d514c631eb'
source=("${pkgname}::git+https://github.com/freevo/kaa-base#commit=${_commit}")