summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c9fbd584a81d..36087f92795a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,7 +29,6 @@ pkgbase = krita-git
depends = hicolor-icon-theme
provides = krita
conflicts = krita
- conflicts = calligra-krita
source = git://anongit.kde.org/krita.git
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 28041ce465ee..204527b8c8d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,7 +31,7 @@ makedepends=('extra-cmake-modules'
'kwindowsystem'
)
provides=('krita')
-conflicts=('krita' 'calligra-krita')
+conflicts=('krita')
install=krita-git.install
source=('git://anongit.kde.org/krita.git')
sha1sums=('SKIP')