Remove leftover merge conflict. #1657
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
googlebot
added
the
cla: yes
kurtisvg
added
kokoro:force-run
frankyn
reviewed
Aug 27, 2018
| <<<<<<< 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 |
There was a problem hiding this comment.
Looks like pubsub went back a minor version is this expected?
There was a problem hiding this comment.
Not sure - I'm hoping that fixing this file will unblock DPEbot and it'll autoupdate it with everything else.
frankyn
approved these changes
Aug 27, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removing the leftover merge conflict that's tripping DPEbot up.