Remove leftover merge conflict. (#1657)

Author: kurtisvg

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