update

2 files changed, 3 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f8f4e4e1cd2f..674c7b28e5cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Apr 27 13:44:38 UTC 2016
+# Thu Apr 28 06:07:34 UTC 2016
 pkgbase = micro-git
 	pkgdesc = A modern and intuitive terminal-based text editor
 	pkgver = 957e97d
@@ -11,6 +11,7 @@ pkgbase = micro-git
 	makedepends = go
 	makedepends = git
 	optdepends = xclip
+	conflicts = micro
 	source = micro-git::git+https://github.com/zyedidia/micro.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 48d54ad664d8..d6bf649d9e8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,6 +8,7 @@ url="https://github.com/zyedidia/micro"
 license=('MIT')
 makedepends=('go' 'git')
 optdepends=(xclip)
+conflicts=("micro")
 source=("${pkgname}"::"git+https://github.com/zyedidia/micro.git")
 md5sums=(SKIP)
 pkgver() {