jzatarski
commented
5 years ago Hopefully I didn't break anything just now
Closed ascrnet closed 5 years ago
jzatarski
commented
5 years ago Hopefully I didn't break anything just now
The file optionsdialog.ui has some conflicts that need to be resolved. If you can leave out 8aeeb14 for now, I can merge this. To fix the conflict, I think you can fork from develop, repeat the changes you made on the current version of optionsdialog.ui, and create another pull request.