Closed bgunnar5 closed 1 year ago
I have no idea why the merge between develop and main for v1.10.2 has merge conflicts. I ran through the command line steps it shows on my own fork to try to resolve these conflicts so that's what this merge is.
I have no idea why the merge between develop and main for v1.10.2 has merge conflicts. I ran through the command line steps it shows on my own fork to try to resolve these conflicts so that's what this merge is.