Skip to content

Commit 00435d2

Browse files
kurtisvgkurtisvg
authored
Remove leftover merge conflict. (GoogleCloudPlatform#1657)
1 parent 6ecb359 commit 00435d2

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

‎storage/cloud-client/requirements.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
1-
<<<<<<< HEAD
2-
google-cloud-storage==1.8.0
3-
google-cloud-pubsub==0.33.0
4-
=======
51
google-cloud-storage==1.10.0
62
google-cloud-pubsub==0.32.1
7-
>>>>>>> master

0 commit comments

Comments
 (0)