Add conflict statement to composer.json #232
Merged
Conversation
This file contains 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
dwsupplee
approved these changes
Mar 26, 2019
Codecov Report
@@ Coverage Diff @@
## master #232 +/- ##
=======================================
Coverage 91.31% 91.31%
=======================================
Files 49 49
Lines 2095 2095
=======================================
Hits 1913 1913
Misses 182 182Continue to review full report at Codecov.
|
1 similar comment
Codecov Report
@@ Coverage Diff @@
## master #232 +/- ##
=======================================
Coverage 91.31% 91.31%
=======================================
Files 49 49
Lines 2095 2095
=======================================
Hits 1913 1913
Misses 182 182Continue to review full report at Codecov.
|
michaelbausor
added a commit
that referenced
this pull request
Mar 27, 2019
## Google ApiCore 1.0.0 Moving ApiCore to GA! ### RequestBuilding serialization approach - Added a new serialization approach in RequestBuilder (#226) ### Protobuf changes - Updated protobuf dependency to 3.7.1 (#232) - Added conflict section to composer.json to prevent protobuf extension conflict (#232) - Remove skip tests for protobuf extension (#230) ### Cleanup and dependencies - Update common-protos dependency to 1.0 (#231) - Update license files (#228)
michaelbausor
added a commit
that referenced
this pull request
Mar 27, 2019
## Google ApiCore 1.0.0 Moving ApiCore to GA! ### RequestBuilding serialization approach - Added a new serialization approach in RequestBuilder (#226) ### Protobuf changes - Updated protobuf dependency to 3.7.1 (#232) - Added conflict section to composer.json to prevent protobuf extension conflict (#232) - Remove skip tests for protobuf extension (#230) ### Cleanup and dependencies - Update common-protos dependency to 1.0 (#231) - Update license files (#228)
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.
No description provided.