Skip to content

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Oct 28, 2022

This fixes a wrong resolved merge conflict.
#4900

@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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants