Merge branch 'master' of ssh://aur.archlinux.org/sodalite-git

3 files changed, 2 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b63b45070734..d769c46a1ae0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,7 @@ pkgbase = sodalite-git
 	depends = python-binaryornot
 	depends = python-npyscreen-git
 	depends = python-yaml
+	conflicts = sodalite
 	source = git+https://github.com/hnicke/sodalite.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 044c81574be7..9001c2d0344e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,6 +6,7 @@ pkgdesc="Keyboard-driven terminal file navigator and launcher"
 arch=('any')
 url="www.github.com/hnicke/sodalite"
 license=('GPL')
+conflicts=('sodalite')
 makedepends=('git' 'awk' )
 depends=('python-binaryornot' 'python-npyscreen-git' 'python-yaml')
 source=('git+https://github.com/hnicke/sodalite.git')
diff --git a/sodalite.install b/sodalite.install
index 027d857f8e22..562fc60a6b1a 100644
--- a/sodalite.install
+++ b/sodalite.install
@@ -17,5 +17,3 @@ post_install() {
 
     "
 }
-
-post_install