Remove leftover merge conflict. (#1657)

GoogleCloudPlatform · Aug 27, 2018 · 00435d2 · 00435d2
1 parent 6ecb359
commit 00435d2
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/storage/cloud-client/requirements.txt b/storage/cloud-client/requirements.txt
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
-google-cloud-storage==1.8.0
-google-cloud-pubsub==0.33.0
-=======
 google-cloud-storage==1.10.0
 google-cloud-pubsub==0.32.1
->>>>>>> master