Added conflicts with truffle-git

2 files changed, 3 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0826efb3c931..d37454b00e4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Apr  7 12:39:57 UTC 2016
+# Thu Apr  7 13:37:17 UTC 2016
 pkgbase = truffle
 	pkgdesc = A development framework for Ethereum
 	pkgver = 1.0.0
@@ -10,6 +10,7 @@ pkgbase = truffle
 	makedepends = npm
 	depends = nodejs
 	provides = truffle
+	conflicts = truffle-git
 	source = truffle-1.0.0.tar.gz::https://github.com/ConsenSys/truffle/archive/v1.0.0.tar.gz
 	sha256sums = 93bcb6091d119ed2d657ecfb33ba0a949415ed6e5bf22e2d731e26deb968163d
 
diff --git a/PKGBUILD b/PKGBUILD
index b1ae1dcab9ac..4d98b5d1669a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,6 +9,7 @@ license=('MIT')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ConsenSys/truffle/archive/v1.0.0.tar.gz")
 makedepends=('npm')
 depends=('nodejs')
+conflicts=('truffle-git')
 sha256sums=('93bcb6091d119ed2d657ecfb33ba0a949415ed6e5bf22e2d731e26deb968163d')
 provides=('truffle')