Skip to content

Fix PubSub client conflict #1551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bgsouza wants to merge 2 commits into from
Closed

Fix PubSub client conflict #1551

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff1cce9
Fix PubSub client conflict
bgsouza Jul 5, 2018
3b7f8b8
Merge branch 'master' into patch-1
bgsouza Aug 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions pubsub/cloud-client/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
<<<<<<< HEAD
google-cloud-pubsub==0.33.0
=======
google-cloud-pubsub==0.32.1
futures==3.1.1; python_version < '3'
>>>>>>> master