Added re2 to the conflicts array

2 files changed, 6 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4693af8a03cd..37a3cefddd04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Thu Jan  7 07:16:37 UTC 2016
 pkgbase = re2-git
 	pkgdesc = A fast, safe, thread-friendly alternative to backtracking regular expression engines, a C++ library.
-	pkgver = 2015.06.01.r0.g7884045
+	pkgver = 2015.11.01.r23.g1fbcda1
 	pkgrel = 1
 	url = https://github.com/google/re2
 	arch = i686
@@ -8,6 +10,7 @@ pkgbase = re2-git
 	license = BSD
 	makedepends = git
 	provides = re2
+	conflicts = re2
 	source = re2-git::git+https://github.com/google/re2
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 57d78a60feed..072c9960f4d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: aksr <aksr at t-com dot me>
 pkgname=re2-git
-pkgver=2015.06.01.r0.g7884045
+pkgver=2015.11.01.r23.g1fbcda1
 pkgrel=1
 epoch=
 pkgdesc="A fast, safe, thread-friendly alternative to backtracking regular expression engines, a C++ library."
@@ -13,7 +13,7 @@ makedepends=('git')
 optdepends=()
 checkdepends=()
 provides=('re2')
-conflicts=()
+conflicts=('re2')
 replaces=()
 backup=()
 options=()