Repository navigation
systemlibs: protobuf: fix merge conflict - #44488
Merged
Merged
Conversation
The merge of PR 44222 ended up with duplicate keys in the bazel rule Signed-off-by: Jason Zaman <[email protected]>
mihaimaruseac
approved these changes
Nov 2, 2020
google-ml-butler
Bot
added
kokoro:force-run
Contributor
|
Oh, I just realized this was on master, not on the release branch. Should not have merged manually. |
Contributor
|
Reverting and reverting forward to fix my mistake, sorry. |
copybara-service Bot
pushed a commit
that referenced
this pull request
Nov 2, 2020
This is PR #44488 which I accidentally merged manually PiperOrigin-RevId: 340262802 Change-Id: Id7ae9ff55cacb6789cd91cf72d9087bb415f63df
Contributor
|
Should be fixed now. Sorry for the loops. |
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
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.
The merge of PR 44222 ended up with duplicate keys in the bazel rule
Signed-off-by: Jason Zaman [email protected]