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

Fix sorting regression #11020

Merged
merged 1 commit into from
Oct 29, 2022
Merged

Fix sorting regression #11020

merged 1 commit into from
Oct 29, 2022

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Oct 28, 2022 •
edited
Loading

This fixes a wrong resolved merge conflict.
#4900

@daschuer daschuer requested a review from ronso0 October 28, 2022 21:17
@daschuer daschuer mentioned this pull request Oct 28, 2022
Merged
ronso0
ronso0 requested changes Oct 28, 2022
View reviewed changes
src/library/basesqltablemodel.cpp Outdated Show resolved Hide resolved
@daschuer
Copy link
Member Author

Done

@ronso0
Copy link
Member

ronso0 commented Oct 28, 2022

LGTM, feel free to merge it yourself once CI is all green.

@ronso0 ronso0 merged commit 963f2ce into mixxxdj:main Oct 29, 2022
@daschuer daschuer deleted the lp1972772 branch November 16, 2022 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ronso0 ronso0 ronso0 requested changes

Assignees
No one assigned
Labels
library
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@daschuer @ronso0