fix: Add watchman to conflicts array

2 files changed, 5 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f380cd532c8..5e0f1ddaa067 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Dec 12 15:53:11 UTC 2015
+# Wed Jul 27 04:29:28 UTC 2016
 pkgbase = watchman-git
 	pkgdesc = Watches files and records, or triggers actions, when they change.
-	pkgver = r717.a75b2b8
+	pkgver = r982.2565188
 	pkgrel = 1
 	url = https://facebook.github.io/watchman/
 	arch = i686
@@ -10,6 +10,7 @@ pkgbase = watchman-git
 	license = Apache
 	makedepends = git
 	depends = pcre
+	conflicts = watchman
 	options = !libtool
 	options = staticlibs
 	source = watchman::git+https://github.com/facebook/watchman.git
diff --git a/PKGBUILD b/PKGBUILD
index 29867dbbbe1e..94071d967120 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=watchman-git
 _gitname=watchman
-pkgver=r717.a75b2b8
+pkgver=r982.2565188
 pkgrel=1
 pkgdesc='Watches files and records, or triggers actions, when they change.'
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url='https://facebook.github.io/watchman/'
 license=('Apache')
 depends=('pcre')
 makedepends=('git')
-conflicts=()
+conflicts=('watchman')
 options=('!libtool' 'staticlibs')
 provides=()
 source=("${_gitname}::git+https://github.com/facebook/watchman.git")