Fix PubSub client conflict

[bgsouza]

Correcting the requirements.txt file conflict to proceed with the installation
$ pip install -r requirements.txt

[googlebot]

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here (e.g. I signed it!) and we'll verify it.

---

What to do if you already signed the CLA

Individual signers

• It's possible we don't have your GitHub username or you're using a different email address on your commit. Check your existing CLA data and verify that your email is set on your git commits.

Corporate signers

• Your company has a Point of Contact who decides which employees are authorized to participate. Ask your POC to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the Google project maintainer to go/cla#troubleshoot (Public version).
• The email used to register you as an authorized contributor must be the email used for the Git commit. Check your existing CLA data and verify that your email is set on your git commits.
• The email used to register you as an authorized contributor must also be attached to your GitHub account.

[techieshark]

@bgsouza did you want to sign the CLA so this can merge and fix #1550 ?

[bgsouza]

@techieshark Yes! how can I do this?
I already did my registration to get the cla 'but do not know how to "re-process" here on GitHub

[googlebot]

CLAs look good, thanks!

[techieshark]

@bgsouza super, looks like that worked, now we just need someone (w/ write access) to review and merge.

[0x5d]

Hi! Any progress on this? I'd love to see this fix merged.

[bgsouza]

Hi @castillobgr, not yet :(
I am awaiting authorization for merge

[bgsouza]

Hi, I made a small fix on this file as it was breaking execution with python2

[bgsouza]

fix version conflict

[bgsouza]

please review this commit

[techieshark]

It seems that master has been updated outside of this PR, but with the effect of fixing the issue - see https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/pubsub/cloud-client/requirements.txt

Should we close this?