Fix the build. #7933
Merged
Fix the build. #7933
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
Merge conflict between changes to the codegen template and another PR that added more generated bits in parallel.
pullapprove
bot
requested review from
andy31415,
chrisdecenzo,
jelderton,
jmartinez-silabs,
LuDuda,
mspang,
saurabhst and
woody-apple
saurabhst
approved these changes
Jun 26, 2021
bzbarsky-apple
added
hotfix
woody-apple
approved these changes
Jun 26, 2021
|
Merging to fix build |
nikita-s-wrk
pushed a commit
to nikita-s-wrk/connectedhomeip
that referenced
this pull request
Sep 23, 2021
Merge conflict between changes to the codegen template and another PR that added more generated bits in parallel.
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.
Merge conflict between changes to the codegen template and another PR
that added more generated bits in parallel.
Problem
Build broken.
Change overview
Fix -Wconversion-triggering code by rerunning ZAP.
Testing
Compiled it.