From f84ef99783dffd7717ff6bff8afd1589e08a785d Mon Sep 17 00:00:00 2001 From: Jonas Pfannschmidt Date: Fri, 6 Jul 2018 17:54:28 +0100 Subject: [PATCH] Remove leftovers from a previous merge conflict --- pubsub/cloud-client/requirements.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pubsub/cloud-client/requirements.txt b/pubsub/cloud-client/requirements.txt index dcffe157c20..5601ca5ea29 100644 --- a/pubsub/cloud-client/requirements.txt +++ b/pubsub/cloud-client/requirements.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD google-cloud-pubsub==0.33.0 -======= -google-cloud-pubsub==0.32.1 futures==3.1.1; python_version < '3' ->>>>>>> master