Remove leftover merge conflict. (#1657)

kurtisvg · web-flow · commit 00435d2d987e · 2018-08-27T11:25:59.000-07:00
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
