Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lint: fix error #9464

Merged
merged 1 commit into from
Aug 27, 2021
Merged

lint: fix error #9464

merged 1 commit into from
Aug 27, 2021

Conversation

david-allison
Copy link
Member

@david-allison david-allison commented Aug 27, 2021 •
edited
Loading

Cause: conflict between #9343 and #8812

ref: #9286

@david-allison
lint: fix error
b89d3d1 
Cause: conflict between 9343 and 8812

ref: 9286
@david-allison david-allison added the Review High Priority Request for high priority review label Aug 27, 2021
mikehardy
mikehardy approved these changes Aug 27, 2021
View reviewed changes
Copy link
Member

@mikehardy mikehardy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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!

@mikehardy mikehardy merged commit a48b666 into ankidroid:master Aug 27, 2021
@mikehardy mikehardy removed the Review High Priority Request for high priority review label Aug 27, 2021
@mikehardy mikehardy added this to the 2.16 release milestone Aug 27, 2021
@david-allison david-allison deleted the fix-broken-build branch August 27, 2021 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikehardy mikehardy mikehardy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.16 release
Development

Successfully merging this pull request may close these issues.
2 participants
@david-allison @mikehardy