lint: fix error#9464
Merged
mikehardy merged 1 commit intoankidroid:masterfrom Aug 27, 2021
Merged
Conversation
Cause: conflict between 9343 and 8812 ref: 9286
david-allison
force-pushed
the
fix-broken-build
branch
from
a965b76 to
b89d3d1
Compare
mikehardy
approved these changes
Aug 27, 2021
Member
mikehardy
left a comment
mikehardy
left a comment
There was a problem hiding this comment.
I still prefer the very occasional build break vs what I've personally experienced as the real every-time overhead of requiring merge from master to PR then CI before merge from PR to master. But it's not awesome either way. Thanks for fixing this!
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
2 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.
Cause: conflict between #9343 and #8812
ref: #9286