Added conflicts=(android-file-transfer-linux-git)

2 files changed, 3 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3290ef31d57b..1ce4003fd92d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Dec 26 04:17:07 UTC 2015
+# Sat Dec 26 04:27:16 UTC 2015
 pkgbase = android-file-transfer-linux-git
 	pkgdesc = An interactive MTP client implemented in C++ using Qt toolkit
 	pkgver = v2.4.r175.g6eab331
@@ -19,6 +19,7 @@ pkgbase = android-file-transfer-linux-git
 	depends = xdg-utils
 	depends = libxkbcommon-x11
 	depends = file
+	conflicts = android-file-transfer
 	source = git://github.com/whoozle/android-file-transfer-linux.git#branch=master
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 30ab7850630b..e21ccb7dad5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,6 +12,7 @@ url="https://github.com/whoozle/android-file-transfer-linux"
 license=(GPL3)
 depends=('qt5-base' 'fuse' 'hicolor-icon-theme' 'xdg-utils' 'libxkbcommon-x11' 'file')
 makedepends=('cmake' 'git' 'ninja' 'mesa')
+conflicts=('android-file-transfer')
 install=$pkgname.install
 source=("git://github.com/$_gitauthor/$_pkgname.git#branch=$_gitbranch")
 md5sums=('SKIP')