update

2 files changed, 3 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 789767206527..606f48cc602e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Apr 27 13:47:30 UTC 2016
+# Thu Apr 28 06:06:39 UTC 2016
 pkgbase = micro
 	pkgdesc = A modern and intuitive terminal-based text editor
 	pkgver = 0.0
@@ -9,6 +9,7 @@ pkgbase = micro
 	arch = i686
 	license = MIT
 	optdepends = xclip
+	conflicts = micro-git
 	source = http://zbyedidia.webfactional.com/micro/binaries/micro-linux32.tar.gz
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 735df50306a8..50cc3c482524 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,6 +7,7 @@ arch=('x86_64' 'i686')
 url="https://github.com/zyedidia/micro"
 license=('MIT')
 optdepends=(xclip)
+conflicts=("micro-git")
 
 if [[ $CARCH == 'x86_64' ]]; then
   source=(http://zbyedidia.webfactional.com/micro/binaries/micro-linux64.tar.gz)