From c23f4ce7a5a6b651e7e7a81558e00adcd1e44903 Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Fri, 21 Jul 2017 23:04:04 +0200
Subject: [PATCH] gmock: no longer conflicts with gtest

This was resolved in 3da84d425bbdedd86bffb2b54cc877423a5731a3
---
 srcpkgs/gmock/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gmock/template b/srcpkgs/gmock/template
index f649dacb202..3bc59c9c1f4 100644
--- a/srcpkgs/gmock/template
+++ b/srcpkgs/gmock/template
@@ -1,7 +1,7 @@
 # Template build file for 'gmock'
 pkgname=gmock
 version=1.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 short_desc="Google C++ Mocking Framework"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
@@ -22,7 +22,6 @@ post_install() {
 }
 
 gmock-devel_package() {
-	conflicts="gtest-devel>=0"
 	depends="gmock>=${version}_${revision} gtest-devel"
 	short_desc+=" - development files"
 	pkg_install() {