From ff1cce9e97b54a1721fe38311361d872fdbc5ab4 Mon Sep 17 00:00:00 2001
From: "Bruno G. Souza" <bruno@bgsouza.com>
Date: Thu, 5 Jul 2018 16:43:49 -0300
Subject: [PATCH] Fix PubSub client conflict

Correcting the requirements.txt file conflict to proceed with the installation
$ pip install -r requirements.txt
---
 pubsub/cloud-client/requirements.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pubsub/cloud-client/requirements.txt b/pubsub/cloud-client/requirements.txt
index dcffe157c20..c74eb4e3ccc 100644
--- a/pubsub/cloud-client/requirements.txt
+++ b/pubsub/cloud-client/requirements.txt
@@ -1,6 +1 @@
-<<<<<<< HEAD
 google-cloud-pubsub==0.33.0
-=======
-google-cloud-pubsub==0.32.1
-futures==3.1.1; python_version < '3'
->>>>>>> master