Fixing merge conflict in setup.py for Speech.
#3609
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
dhermes
added
api: speech
googlebot
added
the
cla: yes
dhermes
commented
Jul 17, 2017
| 'zip_safe': False, | ||
| 'classifiers': [ | ||
| 'Development Status :: 3 - Alpha', | ||
| 'Development Status :: 4 - Beta', |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
landrito
pushed a commit
to landrito/google-cloud-python
that referenced
this pull request
Aug 21, 2017
landrito
pushed a commit
to landrito/google-cloud-python
that referenced
this pull request
Aug 22, 2017
landrito
pushed a commit
to landrito/google-cloud-python
that referenced
this pull request
Aug 22, 2017
atulep
pushed a commit
that referenced
this pull request
Apr 3, 2023
atulep
pushed a commit
that referenced
this pull request
Apr 18, 2023
parthea
pushed a commit
that referenced
this pull request
Oct 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
No description provided.