Open brightly-salty opened 3 years ago
This needs a rebase to fix the merge conflicts (and to separate out the formatting changes which should now be redundant), but otherwise this looks good to me.
@brightly-salty That merge doesn't seem to have addressed the conflicts. Also, please don't back-merge main into a PR branch.
Could you rebase this, please?
@joshtriplett Okay, I've rebased it but I'm afraid I might have resolved the conflicts incorrectly. Let me know if something is wrong.
Fixes #300