updated conflicts

2 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 585afa4e679e..ae04aacb9177 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nemo-ext-git-git
 	pkgdesc = Nemo extension to add important information about the current git directory
 	pkgver = 1.3.r16.g5389549
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/bilelmoussaoui/nautilus-git
 	arch = i686
 	arch = x86_64
@@ -17,6 +17,7 @@ pkgbase = nemo-ext-git-git
 	provides = nautilus-git=1.3
 	conflicts = nemo-ext-git-1.3
 	conflicts = nautilus-git=1.3
+	conflicts = nemo-folder-icons
 	source = nemo-ext-git::git+https://github.com/bilelmoussaoui/nautilus-git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 05f1452318bb..c3fb7f770170 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=nemo-ext-git-git
 pkgver=1.3.r16.g5389549
-pkgrel=3
+pkgrel=4
 pkgdesc="Nemo extension to add important information about the current git directory"
 arch=('i686' 'x86_64')
 url="https://github.com/bilelmoussaoui/nautilus-git"
@@ -9,7 +9,8 @@ license=('GPL3')
 depends=('git' 'gobject-introspection' 'gtk3' 'nemo-python')
 makedepends=('gnome-common' 'meson' 'intltool')
 provides=("${pkgname%-git}=1.3" 'nautilus-git=1.3')
-conflicts=("${pkgname%-git}-1.3" 'nautilus-git=1.3')
+conflicts=("${pkgname%-git}-1.3" 'nautilus-git=1.3' 'nemo-folder-icons')
+            # See https://github.com/bilelmoussaoui/nautilus-folder-icons/issues/34
 source=("${pkgname%-git}::git+https://github.com/bilelmoussaoui/nautilus-git")
 sha256sums=('SKIP')